SERVER-36978 TaskRunner must ensure Client is initialized for thread before running tasks

(cherry picked from commit fb4e163ff4a8ce5057b66b24f41f1bf193e2058c)

1 files changed, 7 insertions, 10 deletions

diff --git a/src/mongo/db/repl/task_runner.cpp b/src/mongo/db/repl/task_runner.cpp
index 210718bba3e..134160bbdf1 100644
--- a/src/mongo/db/repl/task_runner.cpp
+++ b/src/mongo/db/repl/task_runner.cpp
@@ -131,20 +131,17 @@ void TaskRunner::join() {
 }
 
 void TaskRunner::_runTasks() {
-    Client* client = nullptr;
+    // We initialize cc() because ServiceContextMongoD::_newOpCtx() expects cc() to be equal to the
+    // client used to create the operation context.
+    Client::initThreadIfNotAlready();
+    Client* client = &cc();
+    if (AuthorizationManager::get(client->getServiceContext())->isAuthEnabled()) {
+        AuthorizationSession::get(client)->grantInternalAuthorization();
+    }
     ServiceContext::UniqueOperationContext txn;
 
     while (Task task = _waitForNextTask()) {
         if (!txn) {
-            if (!client) {
-                // We initialize cc() because ServiceContextMongoD::_newOpCtx() expects cc()
-                // to be equal to the client used to create the operation context.
-                Client::initThreadIfNotAlready();
-                client = &cc();
-                if (getGlobalAuthorizationManager()->isAuthEnabled()) {
-                    AuthorizationSession::get(client)->grantInternalAuthorization();
-                }
-            }
             txn = client->makeOperationContext();
         }