SERVER-13961 Remove TLS LockState accesses from repl

1 files changed, 5 insertions, 3 deletions

diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index ef01eb2b60e..216e4a2e1e7 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -537,8 +537,6 @@ namespace repl {
             string threadName = str::stream() << "repl writer worker "
                                               << replWriterWorkerId.addAndFetch(1);
             Client::initThread( threadName.c_str() );
-            // allow us to get through the magic barrier
-            Lock::ParallelBatchWriterMode::iAmABatchParticipant(&cc().lockState());
             replLocalAuth();
         }
     }
@@ -547,6 +545,11 @@ namespace repl {
     void multiSyncApply(const std::vector<BSONObj>& ops, SyncTail* st) {
         initializeWriterThread();
 
+        OperationContextImpl txn;
+
+        // allow us to get through the magic barrier
+        Lock::ParallelBatchWriterMode::iAmABatchParticipant(txn.lockState());
+
         // convert update operations only for 2.2.1 or greater, because we need guaranteed
         // idempotent operations for this to work.  See SERVER-6825
         bool convertUpdatesToUpserts = theReplSet->oplogVersion > 1 ? true : false;
@@ -555,7 +558,6 @@ namespace repl {
              it != ops.end();
              ++it) {
             try {
-                OperationContextImpl txn;
                 if (!st->syncApply(&txn, *it, convertUpdatesToUpserts)) {
                     fassertFailedNoTrace(16359);
                 }