Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed wait for sync in mmfiles (#3478)

This commit is contained in:
Simon Grätzer 2017-10-23 12:36:50 +02:00 committed by Jan
parent 3e211f0d9e
commit 09840239c9
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/MMFiles/MMFilesEngine.cpp
View File

@ -701,11 +701,18 @@ int MMFilesEngine::getViews(TRI_vocbase_t* vocbase,
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
void MMFilesEngine::waitForSync(double maxWait) { void MMFilesEngine::waitForSyncTick(TRI_voc_tick_t tick) {
if (application_features::ApplicationServer::isStopping()) { if (application_features::ApplicationServer::isStopping()) {
THROW_ARANGO_EXCEPTION(TRI_ERROR_SHUTTING_DOWN); THROW_ARANGO_EXCEPTION(TRI_ERROR_SHUTTING_DOWN);
} }
MMFilesLogfileManager::instance()->slots()->waitForTick(tick);
}
void MMFilesEngine::waitForSyncTimeout(double maxWait) {
if (application_features::ApplicationServer::isStopping()) {
THROW_ARANGO_EXCEPTION(TRI_ERROR_SHUTTING_DOWN);
}
MMFilesLogfileManager::instance()->waitForSync(maxWait); MMFilesLogfileManager::instance()->waitForSync(maxWait);
} }

4
arangod/MMFiles/MMFilesEngine.h
View File

@ -167,7 +167,9 @@ class MMFilesEngine final : public StorageEngine {
std::string versionFilename(TRI_voc_tick_t id) const override; std::string versionFilename(TRI_voc_tick_t id) const override;
void waitForSync(double maxWait) override; void waitForSyncTick(TRI_voc_tick_t tick) override;
void waitForSyncTimeout(double maxWait) override;
virtual TRI_vocbase_t* openDatabase( virtual TRI_vocbase_t* openDatabase(
arangodb::velocypack::Slice const& parameters, bool isUpgrade, arangodb::velocypack::Slice const& parameters, bool isUpgrade,

4
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -1759,7 +1759,7 @@ void RestReplicationHandler::handleCommandSync() {
// wait until all data in current logfile got synced // wait until all data in current logfile got synced
StorageEngine* engine = EngineSelectorFeature::ENGINE; StorageEngine* engine = EngineSelectorFeature::ENGINE;
TRI_ASSERT(engine != nullptr); TRI_ASSERT(engine != nullptr);
engine->waitForSync(5.0); engine->waitForSyncTimeout(5.0);
TRI_ASSERT(!config._skipCreateDrop); TRI_ASSERT(!config._skipCreateDrop);
std::unique_ptr<InitialSyncer> syncer; std::unique_ptr<InitialSyncer> syncer;
@ -2344,7 +2344,7 @@ void RestReplicationHandler::handleCommandLoggerState() {
StorageEngine* engine = EngineSelectorFeature::ENGINE; StorageEngine* engine = EngineSelectorFeature::ENGINE;
TRI_ASSERT(engine); TRI_ASSERT(engine);
engine->waitForSync(10.0); // only for mmfiles engine->waitForSyncTimeout(10.0); // only for mmfiles
VPackBuilder builder; VPackBuilder builder;
auto res = engine->createLoggerState(_vocbase, builder); auto res = engine->createLoggerState(_vocbase, builder);

8
arangod/RocksDBEngine/RocksDBEngine.h
View File

@ -156,10 +156,10 @@ class RocksDBEngine final : public StorageEngine {
// database, collection and index management // database, collection and index management
// ----------------------------------------- // -----------------------------------------
void waitForSync(double) override { // intentionally empty, not useful for this type of engine
// intentionally empty, not useful for this type of engine void waitForSyncTick(TRI_voc_tick_t) override {}
} void waitForSyncTimeout(double) override {}
virtual TRI_vocbase_t* openDatabase(velocypack::Slice const& parameters, virtual TRI_vocbase_t* openDatabase(velocypack::Slice const& parameters,
bool isUpgrade, int&) override; bool isUpgrade, int&) override;

6
arangod/StorageEngine/StorageEngine.h
View File

@ -150,9 +150,9 @@ class StorageEngine : public application_features::ApplicationFeature {
// if not stated other wise functions may throw and the caller has to take care of error handling // if not stated other wise functions may throw and the caller has to take care of error handling
// the return values will be the usual TRI_ERROR_* codes. // the return values will be the usual TRI_ERROR_* codes.
// TODO add pre / post conditions for functions virtual void waitForSyncTick(TRI_voc_tick_t tick) = 0;
virtual void waitForSync(double maxWait) = 0; virtual void waitForSyncTimeout(double maxWait) = 0;
//// operations on databasea //// operations on databasea

6
arangod/Transaction/Methods.cpp
View File

@ -1441,7 +1441,7 @@ OperationResult transaction::Methods::insertLocal(
// wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0 // wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0
if (res.ok() && options.waitForSync && maxTick > 0 && if (res.ok() && options.waitForSync && maxTick > 0 &&
isSingleOperationTransaction()) { isSingleOperationTransaction()) {
EngineSelectorFeature::ENGINE->waitForSync(maxTick); EngineSelectorFeature::ENGINE->waitForSyncTick(maxTick);
} }
if (res.ok() && _state->isDBServer()) { if (res.ok() && _state->isDBServer()) {
@ -1786,7 +1786,7 @@ OperationResult transaction::Methods::modifyLocal(
// wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0 // wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0
if (res.ok() && options.waitForSync && maxTick > 0 && if (res.ok() && options.waitForSync && maxTick > 0 &&
isSingleOperationTransaction()) { isSingleOperationTransaction()) {
EngineSelectorFeature::ENGINE->waitForSync(maxTick); EngineSelectorFeature::ENGINE->waitForSyncTick(maxTick);
} }
// Now see whether or not we have to do synchronous replication: // Now see whether or not we have to do synchronous replication:
@ -2067,7 +2067,7 @@ OperationResult transaction::Methods::removeLocal(
// wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0 // wait for operation(s) to be synced to disk here. On rocksdb maxTick == 0
if (res.ok() && options.waitForSync && maxTick > 0 && if (res.ok() && options.waitForSync && maxTick > 0 &&
isSingleOperationTransaction()) { isSingleOperationTransaction()) {
EngineSelectorFeature::ENGINE->waitForSync(maxTick); EngineSelectorFeature::ENGINE->waitForSyncTick(maxTick);
} }
// Now see whether or not we have to do synchronous replication: // Now see whether or not we have to do synchronous replication: