summaryrefslogtreecommitdiff
path: root/src/mongo/db/write_concern.cpp
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2015-11-20 07:30:17 -0500
committermatt dannenberg <matt.dannenberg@10gen.com>2015-11-20 10:44:38 -0500
commit8b4f6e5aa491c26b135607bb9d16e3a815491b62 (patch)
tree8d1e78cfc02c64ac6c271e6b340b715cea1c4c8a /src/mongo/db/write_concern.cpp
parent3a8aab65a494f6e5b31ea0358a517b103e1cbcb6 (diff)
downloadmongo-8b4f6e5aa491c26b135607bb9d16e3a815491b62.tar.gz
SERVER-21589 SERVER-21362 disable journal sync in PV0
This reverts commit 9e431f4fd9a6af65292aff3729a3f6d281784ac1.
Diffstat (limited to 'src/mongo/db/write_concern.cpp')
-rw-r--r--src/mongo/db/write_concern.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp
index 47a15f6c588..e5e700fa49e 100644
--- a/src/mongo/db/write_concern.cpp
+++ b/src/mongo/db/write_concern.cpp
@@ -67,7 +67,8 @@ void setupSynchronousCommit(OperationContext* txn) {
namespace {
// The consensus protocol requires that w: majority implies j: true on all nodes.
void addJournalSyncForWMajority(WriteConcernOptions* writeConcern) {
- if (writeConcern->wMode == WriteConcernOptions::kMajority &&
+ if (repl::getGlobalReplicationCoordinator()->isV1ElectionProtocol() &&
+ writeConcern->wMode == WriteConcernOptions::kMajority &&
writeConcern->syncMode == WriteConcernOptions::NONE &&
getGlobalServiceContext()->getGlobalStorageEngine()->isDurable()) {
writeConcern->syncMode = WriteConcernOptions::JOURNAL;