SERVER-50007 Extend FlowControl with shutdown support

3 files changed, 15 insertions, 0 deletions

diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index 52f7fd04579..36cee8e12be 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -1318,6 +1318,8 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
 #ifndef MONGO_CONFIG_USE_RAW_LATCHES
     LatchAnalyzer::get(serviceContext).dump();
 #endif
+
+    FlowControl::shutdown(serviceContext);
 }
 
 }  // namespace
diff --git a/src/mongo/db/storage/flow_control.cpp b/src/mongo/db/storage/flow_control.cpp
index 7ba9d202720..294dbe53488 100644
--- a/src/mongo/db/storage/flow_control.cpp
+++ b/src/mongo/db/storage/flow_control.cpp
@@ -169,6 +169,14 @@ void FlowControl::set(ServiceContext* service, std::unique_ptr<FlowControl> flow
     globalFlow = std::move(flowControl);
 }
 
+void FlowControl::shutdown(ServiceContext* service) {
+    auto& globalFlow = getFlowControl(service);
+    if (globalFlow) {
+        globalFlow->_jobAnchor.stop();
+        globalFlow.reset();
+    }
+}
+
 /**
  * Returns -1.0 if there are not enough samples.
  */
diff --git a/src/mongo/db/storage/flow_control.h b/src/mongo/db/storage/flow_control.h
index d45abd15bab..4a2d66a0af9 100644
--- a/src/mongo/db/storage/flow_control.h
+++ b/src/mongo/db/storage/flow_control.h
@@ -69,6 +69,11 @@ public:
 
     static void set(ServiceContext* service, std::unique_ptr<FlowControl> flowControl);
 
+    /**
+     * Shuts down the flow control job and removes it from the ServiceContext.
+     */
+    static void shutdown(ServiceContext* service);
+
     /*
      * Typical API call.
      *