wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address cr comments:

This commit is contained in:
mengranwo 2019-06-20 17:41:00 -07:00 committed by Alex Miller
parent d96cdacdd5
commit c7148bbb14
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fdbserver/storageserver.actor.cpp
View File

@ -3627,10 +3627,10 @@ bool storageServerTerminated(StorageServer& self, IKeyValueStore* persistentData
return false; return false;
} }
ACTOR Future<bool> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterConnectionFile> connFile, UID id) ACTOR Future<Void> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterConnectionFile> connFile, UID id)
{ {
if(store->getType() != KeyValueStoreType::MEMORY || connFile.getPtr() == nullptr) { if(store->getType() != KeyValueStoreType::MEMORY || connFile.getPtr() == nullptr) {
return false; return Never();
} }
// create a temp client connect to DB // create a temp client connect to DB
@ -3650,7 +3650,7 @@ ACTOR Future<bool> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterCo
TraceEvent("RemoveStorageServerRetrying").detail("Count", noCanRemoveCount++).detail("ServerID", id).detail("CanRemove", canRemove); TraceEvent("RemoveStorageServerRetrying").detail("Count", noCanRemoveCount++).detail("ServerID", id).detail("CanRemove", canRemove);
} else { } else {
wait(tr.commit()); wait(tr.commit());
return true; return Void();
} }
} catch (Error& e) { } catch (Error& e) {
state Error err = e; state Error err = e;
@ -3792,18 +3792,16 @@ ACTOR Future<Void> storageServer( IKeyValueStore* persistentData, StorageServerI
state double start = now(); state double start = now();
TraceEvent("StorageServerRebootStart", self.thisServerID); TraceEvent("StorageServerRebootStart", self.thisServerID);
state Future<bool> dispose = memoryStoreRecover (persistentData, connFile, self.thisServerID);
wait(self.storage.init()); wait(self.storage.init());
//after a rollback there might be uncommitted changes. choose {
//for memory storage engine type, wait until recovery is done before commit //after a rollback there might be uncommitted changes.
state Future<Void> committed = self.storage.commit(); //for memory storage engine type, wait until recovery is done before commit
wait(success(dispose) || success(committed)); wait(self.storage.commit()) {}
if (committed.isReady()) {
// recovery finished before dispose wait(memoryStoreRecover (persistentData, connFile, self.thisServerID)) {
dispose.cancel(); TraceEvent("DisposeStorageServer", self.thisServerID);
} else if (dispose.isReady() && dispose.get()){ throw worker_removed();
TraceEvent("DisposeStorageServer", self.thisServerID); }
throw worker_removed();
} }
bool ok = wait( self.storage.restoreDurableState() ); bool ok = wait( self.storage.restoreDurableState() );