SERVER-39936 Use PeriodicRunner handles to simplify shutdown ordering

1 files changed, 0 insertions, 7 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 0a4a7fb2cbf..b31b90bde7d 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -212,12 +212,6 @@ void cleanupTask(ServiceContext* serviceContext) {
 
         if (serviceContext) {
             serviceContext->setKillAllOperations();
-
-            // Shut down the background periodic task runner.
-            auto runner = serviceContext->getPeriodicRunner();
-            if (runner) {
-                runner->shutdown();
-            }
         }
 
         // Perform all shutdown operations after setKillAllOperations is called in order to ensure
@@ -493,7 +487,6 @@ ExitCode runMongosServer(ServiceContext* serviceContext) {
     // Set up the periodic runner for background job execution
     {
         auto runner = makePeriodicRunner(serviceContext);
-        runner->startup();
         serviceContext->setPeriodicRunner(std::move(runner));
     }