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

style formatting

This commit is contained in:
mengranwo 2019-06-21 14:08:49 -07:00 committed by Alex Miller
parent 819b6e3d6d
commit 0ad151e70a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdbserver/storageserver.actor.cpp
View File

@ -1318,8 +1318,7 @@ ACTOR Future<Key> findKey( StorageServer* data, KeySelectorRef sel, Version vers
ASSERT(returnKey != sel.getKey());
return returnKey;
}
else
} else
return forward ? range.end : range.begin;
}
}
@ -3629,9 +3628,9 @@ bool storageServerTerminated(StorageServer& self, IKeyValueStore* persistentData
ACTOR Future<Void> memoryStoreRecover(IKeyValueStore* store, Reference<ClusterConnectionFile> connFile, UID id)
{
if(store->getType() != KeyValueStoreType::MEMORY || connFile.getPtr() == nullptr) {
return Never();
}
if (store->getType() != KeyValueStoreType::MEMORY || connFile.getPtr() == nullptr) {
return Never();
}
// create a temp client connect to DB
Database cx = Database::createDatabase(connFile, Database::API_VERSION_LATEST);
@ -3792,7 +3791,7 @@ ACTOR Future<Void> storageServer( IKeyValueStore* persistentData, StorageServerI
state double start = now();
TraceEvent("StorageServerRebootStart", self.thisServerID);
wait(self.storage.init());
wait(self.storage.init());
choose {
//after a rollback there might be uncommitted changes.
//for memory storage engine type, wait until recovery is done before commit