SERVER-18983: Apply oplog and record in oplog concurrently

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index 5ceb240989d..182c9a47994 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -333,7 +333,6 @@ void applyOps(const std::vector<std::vector<BSONObj>>& writerVectors,
             writerPool->schedule(func, stdx::cref(*it), sync);
         }
     }
-    writerPool->join();
 }
 
 void fillWriterVectors(const std::deque<BSONObj>& ops,
@@ -401,11 +400,12 @@ OpTime SyncTail::multiApply(OperationContext* txn, const OpQueue& ops) {
 
     applyOps(writerVectors, &_writerPool, _applyFunc, this);
 
+    OpTime lastOpTime = writeOpsToOplog(txn, ops.getDeque());
     if (inShutdown()) {
         return OpTime();
     }
-
-    OpTime lastOpTime = writeOpsToOplog(txn, ops.getDeque());
+    _writerPool.join();
+    // We have now written all database writes and updated the oplog to match.
 
     ReplClientInfo::forClient(txn->getClient()).setLastOp(lastOpTime);
     replCoord->setMyLastOptime(lastOpTime);