SERVER-35114 Make it possible to adjust the period of active jobs in the PeriodicRunner

(cherry picked from commit bf4a3cff4dc5572f2e97cb5279fe63c8227187e0)

SERVER-39936 Use PeriodicRunner handles to simplify shutdown ordering

(cherry picked from commit 1eff33bd1a8d48eb607675f87faf1836ba325006)

This is a partial backport. Parts of the original commits listed do not
exist in v4.0

1 files changed, 4 insertions, 9 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index ad5817c67b9..ce517052716 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -191,12 +191,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
@@ -432,9 +426,10 @@ ExitCode runMongosServer(ServiceContext* serviceContext) {
     PeriodicTask::startRunningPeriodicTasks();
 
     // Set up the periodic runner for background job execution
-    auto runner = makePeriodicRunner(serviceContext);
-    runner->startup();
-    serviceContext->setPeriodicRunner(std::move(runner));
+    {
+        auto runner = makePeriodicRunner(serviceContext);
+        serviceContext->setPeriodicRunner(std::move(runner));
+    }
 
     SessionKiller::set(serviceContext,
                        std::make_shared<SessionKiller>(serviceContext, killSessionsRemote));