Compat with synchronous executor. (#7)

monographdb · Oct 8, 2023 · c88f927 · c88f927
1 parent b2ba69d
commit c88f927
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/mongo/db/concurrency/monograph_locker_noop.h b/src/mongo/db/concurrency/monograph_locker_noop.h
@@ -29,7 +29,9 @@
 #pragma once
 
 
+#include "mongo/db/concurrency/lock_manager_defs.h"
 #include "mongo/db/concurrency/locker.h"
+#include <map>
 #include <utility>
 
 namespace mongo {
@@ -228,7 +230,7 @@ class MonographLockerNoop : public Locker {
     }
 
     void dump() const override {
-        // MONGO_UNREACHABLE;
+        MONGO_UNREACHABLE;
     }
 
     bool isW() const override {
@@ -260,13 +262,14 @@ class MonographLockerNoop : public Locker {
     }
 
     bool isGlobalLockedRecursively() override {
-        return false;
+        return true;
     }
 
     LockMode _lockMode{LockMode::MODE_NONE};
     // Delays release of exclusive/intent-exclusive locked resources until the write unit of
     // work completes. Value of 0 means we are not inside a write unit of work.
     int _wuowNestingLevel{0};
+    std::map<ResourceId, LockMode> _lockMap;
 };
 
 }  // namespace mongo
diff --git a/src/mongo/transport/service_entry_point_impl.cpp b/src/mongo/transport/service_entry_point_impl.cpp
@@ -111,7 +111,7 @@ void ServiceEntryPointImpl::startSession(transport::SessionHandle session) {
         }
     }
 
-    if (serverGlobalParams.enableCoroutine) {
+    if (_coroutineExecutor) {
         MONGO_LOG(0) << "use coroutine service executor";
         ssm->setServiceExecutor(_coroutineExecutor.get());
 

diff --git a/src/mongo/transport/service_entry_point_impl.h b/src/mongo/transport/service_entry_point_impl.h
@@ -86,7 +86,7 @@ class ServiceEntryPointImpl : public ServiceEntryPoint {
     AtomicWord<size_t> _currentConnections{0};
     AtomicWord<size_t> _createdConnections{0};
 
-    std::unique_ptr<transport::ServiceExecutorCoroutine> _coroutineExecutor;
+    std::unique_ptr<transport::ServiceExecutorCoroutine> _coroutineExecutor{nullptr};
 };
 
 }  // namespace mongo
diff --git a/src/mongo/transport/service_state_machine.cpp b/src/mongo/transport/service_state_machine.cpp
@@ -28,6 +28,7 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork
 
+#include "mongo/transport/service_state_machine.h"
 #include "mongo/base/status.h"
 #include "mongo/config.h"
 #include "mongo/db/client.h"
@@ -39,7 +40,6 @@
 #include "mongo/transport/message_compressor_manager.h"
 #include "mongo/transport/service_entry_point.h"
 #include "mongo/transport/service_executor_task_names.h"
-#include "mongo/transport/service_state_machine.h"
 #include "mongo/transport/session.h"
 #include "mongo/transport/transport_layer.h"
 #include "mongo/util/assert_util.h"
@@ -268,6 +268,7 @@ void ServiceStateMachine::Reset(ServiceContext* svcContext,
     _dbClient = svcContext->makeClient(_threadName, std::move(session));
     _dbClientPtr = _dbClient.get();
     _threadGroupId = group_id;
+    _owned.store(Ownership::kUnowned);
 }
 
 const transport::SessionHandle& ServiceStateMachine::_session() const {