apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-03 03:41:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #417 from ajbeamon/merge-release-5.1-into-release-5.2

Browse Source 
Merge release-5.1 into release-5.2
This commit is contained in:
Balachandar Namasivayam 2018-05-30 11:12:29 -07:00 committed by GitHub
commit 526ecc5a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/MultiVersionAssignmentVars.h
View File

@ -135,7 +135,7 @@ public:
~DLThreadSingleAssignmentVar() {
lock.assertNotEntered();
if(f) {
ASSERT(futureRefCount == 1);
ASSERT_ABORT(futureRefCount == 1);
api->futureDestroy(f);
}
}

4
fdbclient/NativeAPI.actor.cpp
View File

@ -93,7 +93,7 @@ LocationInfo::~LocationInfo() {
for( auto const& alternative : getAlternatives() )
handles.push_back( alternative.v.getVersion.getEndpoint().token ); // must match above choice of UID
std::sort( handles.begin(), handles.end() );
ASSERT( handles.size() );
ASSERT_ABORT( handles.size() );
auto it = cx->ssid_locationInfo.find( handles );
if( it != cx->ssid_locationInfo.end() )
@ -549,7 +549,7 @@ DatabaseContext::~DatabaseContext() {
monitorMasterProxiesInfoChange.cancel();
for(auto it = ssid_locationInfo.begin(); it != ssid_locationInfo.end(); it = ssid_locationInfo.erase(it))
it->second->notifyContextDestroyed();
ASSERT( ssid_locationInfo.empty() );
ASSERT_ABORT( ssid_locationInfo.empty() );
locationCache.insert( allKeys, Reference<LocationInfo>() );
}

2
fdbrpc/AsyncFileCached.actor.cpp
View File

@ -233,7 +233,7 @@ Future<Void> AsyncFileCached::quiesce() {
AsyncFileCached::~AsyncFileCached() {
while ( !pages.empty() ) {
auto ok = pages.begin()->second->evict();
ASSERT( ok );
ASSERT_ABORT( ok );
}
openFiles.erase( filename );
}

2
fdbrpc/AsyncFileCached.actor.h
View File

@ -450,7 +450,7 @@ struct AFCPage : public EvictablePage, public FastAllocated<AFCPage> {
virtual ~AFCPage() {
clearDirty();
ASSERT( flushableIndex == -1 );
ASSERT_ABORT( flushableIndex == -1 );
}
void setDirty() {

2
fdbserver/TLogServer.actor.cpp
View File

@ -425,7 +425,7 @@ struct LogData : NonCopyable, public ReferenceCounted<LogData> {
tLogData->bytesDurable += bytesInput.getValue() - bytesDurable.getValue();
TraceEvent("TLogBytesWhenRemoved", tli.id()).detail("sharedBytesInput", tLogData->bytesInput).detail("sharedBytesDurable", tLogData->bytesDurable).detail("localBytesInput", bytesInput.getValue()).detail("localBytesDurable", bytesDurable.getValue());
ASSERT(tLogData->bytesDurable <= tLogData->bytesInput);
ASSERT_ABORT(tLogData->bytesDurable <= tLogData->bytesInput);
endRole(tli.id(), "TLog", "Error", true);
if(!tLogData->terminated) {

2
fdbserver/VFSAsync.cpp
View File

@ -460,7 +460,7 @@ static int asyncDeviceCharacteristics(sqlite3_file *pFile){ return 0; }
//resulting in a locking error
auto itr = SharedMemoryInfo::table.find(filename);
if(itr != SharedMemoryInfo::table.end()) {
ASSERT(itr->second.refcount == 0);
ASSERT_ABORT(itr->second.refcount == 0);
itr->second.cleanup();
}
}

2
flow/IThreadPool.cpp
View File

@ -35,7 +35,7 @@ class ThreadPool : public IThreadPool, public ReferenceCounted<ThreadPool> {
Event stopped;
static thread_local IThreadPoolReceiver* threadUserObject;
explicit Thread(ThreadPool *pool, IThreadPoolReceiver *userObject) : pool(pool), userObject(userObject) {}
~Thread() { ASSERT(!userObject); }
~Thread() { ASSERT_ABORT(!userObject); }
void run() {
deprioritizeThread();