summaryrefslogtreecommitdiff
path: root/src/mongo/db/write_concern.cpp
diff options
context:
space:
mode:
authorMatthew Russotto <matthew.russotto@10gen.com>2017-08-28 17:28:14 -0400
committerMatthew Russotto <matthew.russotto@10gen.com>2017-09-06 11:12:56 -0400
commit7d38c4ab9e7ca5e8e8a5cae6512c171beeb9ce70 (patch)
tree6fe9648ce687360c5bbd73600eb9b8adec5dfaff /src/mongo/db/write_concern.cpp
parent49621e733bfbdd42a57ae5b63bf018dcd8bd07a4 (diff)
downloadmongo-7d38c4ab9e7ca5e8e8a5cae6512c171beeb9ce70.tar.gz
SERVER-28269 Set _canAcceptNonLocalWrites at the end of signalDrainComplete()
Diffstat (limited to 'src/mongo/db/write_concern.cpp')
-rw-r--r--src/mongo/db/write_concern.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp
index 99ceb5689be..234f63f54aa 100644
--- a/src/mongo/db/write_concern.cpp
+++ b/src/mongo/db/write_concern.cpp
@@ -168,7 +168,10 @@ Status waitForWriteConcern(OperationContext* opCtx,
<< ", write concern: " << writeConcern.toBSON();
auto replCoord = repl::ReplicationCoordinator::get(opCtx);
- MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangBeforeWaitingForWriteConcern);
+ if (!opCtx->getClient()->isInDirectClient()) {
+ // Respecting this failpoint for internal clients prevents stepup from working properly.
+ MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangBeforeWaitingForWriteConcern);
+ }
// Next handle blocking on disk
Timer syncTimer;