diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2020-02-16 02:04:08 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-26 07:55:48 +0000 |
| commit | 51eceb8afa6610b4ff0befb92ec6039173bab00f (patch) | |
| tree | 4725ecdb5d0bec00ac6938cf447c21924297ea56 /src/mongo/db/write_concern.cpp | |
| parent | 8651c754eedf84651dd5051aa43c70cd96b00586 (diff) | |
| download | mongo-51eceb8afa6610b4ff0befb92ec6039173bab00f.tar.gz | |
SERVER-44978 Remove accidentally added usage of getGlobalServiceContext() from ReadWriteConcernDefaults
Diffstat (limited to 'src/mongo/db/write_concern.cpp')
| -rw-r--r-- | src/mongo/db/write_concern.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp index 1b493bc129b..1a7f4ee868e 100644 --- a/src/mongo/db/write_concern.cpp +++ b/src/mongo/db/write_concern.cpp @@ -254,6 +254,7 @@ Status waitForWriteConcern(OperationContext* opCtx, "replOpTime"_attr = replOpTime, "writeConcern"_attr = writeConcern.toBSON()); + auto* const storageEngine = opCtx->getServiceContext()->getStorageEngine(); auto const replCoord = repl::ReplicationCoordinator::get(opCtx); if (!opCtx->getClient()->isInDirectClient()) { @@ -273,7 +274,6 @@ Status waitForWriteConcern(OperationContext* opCtx, case WriteConcernOptions::SyncMode::NONE: break; case WriteConcernOptions::SyncMode::FSYNC: { - StorageEngine* storageEngine = getGlobalServiceContext()->getStorageEngine(); if (!storageEngine->isDurable()) { storageEngine->flushAllFiles(opCtx, /*callerHoldsReadLock*/ false); @@ -282,12 +282,12 @@ Status waitForWriteConcern(OperationContext* opCtx, result->fsyncFiles = 1; } else { // We only need to commit the journal if we're durable - getGlobalServiceContext()->getStorageEngine()->waitForJournalFlush(opCtx); + storageEngine->waitForJournalFlush(opCtx); } break; } case WriteConcernOptions::SyncMode::JOURNAL: - getGlobalServiceContext()->getStorageEngine()->waitForJournalFlush(opCtx); + storageEngine->waitForJournalFlush(opCtx); break; } |