SERVER-95072 Reintroduce runOnDataAvailable to SessionWorkflow (#27330)

GitOrigin-RevId: 719c05ac8dae71f39c7a74669ab0575b1ef1bece
lakamson · Oct 1, 2024 · 5c59972 · 5c59972
1 parent 53ac03e
commit 5c59972
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/mongo/transport/service_executor_bm.cpp b/src/mongo/transport/service_executor_bm.cpp
@@ -40,6 +40,7 @@
 #include "mongo/transport/service_executor.h"
 #include "mongo/transport/service_executor_synchronous.h"
 #include "mongo/unittest/barrier.h"
+#include "mongo/unittest/log_test.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/processinfo.h"
 
@@ -92,6 +93,8 @@ class ServiceExecutorSynchronousBm : public benchmark::Fixture {
     }
 
     void lastTearDown() {
+        unittest::MinimumLoggedSeverityGuard suppressNetworkInfoGuard{
+            logv2::LogComponent::kNetwork, logv2::LogSeverity::Warning()};
         (void)executor()->shutdown(Hours{1});
         setGlobalServiceContext({});
     }

diff --git a/src/mongo/transport/service_executor_reserved.cpp b/src/mongo/transport/service_executor_reserved.cpp
@@ -230,7 +230,6 @@ void ServiceExecutorReserved::_runOnDataAvailable(const std::shared_ptr<Session>
                                                   Task task) {
     invariant(session);
     _schedule([this, session, callback = std::move(task)](Status status) {
-        yieldIfAppropriate();
         if (!status.isOK()) {
             callback(std::move(status));
             return;

diff --git a/src/mongo/transport/service_executor_synchronous.cpp b/src/mongo/transport/service_executor_synchronous.cpp
@@ -216,7 +216,6 @@ auto ServiceExecutorSyncImpl::makeTaskRunner() -> std::unique_ptr<TaskRunner> {
 
         void runOnDataAvailable(std::shared_ptr<Session> session, Task task) override {
             invariant(session);
-            _e->yieldIfAppropriate();
             _e->_sharedState->schedule(std::move(task), _e->getName());
         }
 

diff --git a/src/mongo/transport/session_workflow.cpp b/src/mongo/transport/session_workflow.cpp
@@ -790,23 +790,28 @@ Future<void> SessionWorkflow::Impl::_doOneIteration() {
 
 void SessionWorkflow::Impl::_scheduleIteration() try {
     _work = nullptr;
-    taskRunner()->schedule(_captureContext([&](Status status) {
+    auto runOneIteration = _captureContext([&](Status status) {
         if (MONGO_unlikely(!status.isOK())) {
             _cleanupSession(status);
             return;
         }
 
         try {
             // All available service executors use dedicated threads, so it's okay to
-            // run eager futures in an ordinary loop to bypass scheduler overhead.
-            while (true) {
+            // run eager futures in an ordinary loop to bypass scheduler overhead. Loop
+            // while we have `_nextWork` in case there have been synthetic exhaust
+            // requests produced on this iteration.
+            do {
                 _doOneIteration().get();
                 _work = nullptr;
-            }
+            } while (_nextWork);
+            _scheduleIteration();
         } catch (const DBException& ex) {
             _onLoopError(ex.toStatus());
         }
-    }));
+    });
+
+    taskRunner()->runOnDataAvailable(session(), std::move(runOneIteration));
 } catch (const DBException& ex) {
     auto error = ex.toStatus();
     LOGV2_WARNING_OPTIONS(22993,