New upstream version 6.0.20upstream

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index 1fbbb6f5a06..4f46f4ceb71 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -1279,7 +1279,7 @@ void logShutdownTimeElapsedStatistics(ServiceContext* serviceContext,
                                        elapsedInitAndListen.toString());
     shutdownInfoBuilder->append("Statistics", shutdownTimeElapsedBuilder->obj());
     LOGV2_INFO(8423404,
-               "shutdownTask complete",
+               "mongod shutdown complete",
                "Summary of time elapsed"_attr = shutdownInfoBuilder->obj());
 }
 
@@ -1471,7 +1471,10 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
             uniqueOpCtx = client->makeOperationContext();
             opCtx = uniqueOpCtx.get();
         }
-        opCtx->setIsExecutingShutdown();
+        {
+            stdx::lock_guard lg(*client);
+            opCtx->setIsExecutingShutdown();
+        }
 
         // This can wait a long time while we drain the secondary's apply queue, especially if
         // it is building an index.
@@ -1647,7 +1650,7 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
     // Shutdown the Service Entry Point and its sessions and give it a grace period to complete.
     if (auto sep = serviceContext->getServiceEntryPoint()) {
         LOGV2_OPTIONS(4784923, {LogComponent::kCommand}, "Shutting down the ServiceEntryPoint");
-        if (!sep->shutdown(Seconds(10))) {
+        if (!sep->shutdown(Seconds(30))) {
             LOGV2_OPTIONS(20563,
                           {LogComponent::kNetwork},
                           "Service entry point did not shutdown within the time limit");