SERVER-60691 DConcurrencyTest benchmark sets locker using client observer

(cherry picked from commit 5550576ebdbb36135e97a5a4114874c92724c7a0)

1 files changed, 22 insertions, 1 deletions

diff --git a/src/mongo/db/concurrency/d_concurrency_bm.cpp b/src/mongo/db/concurrency/d_concurrency_bm.cpp
index f9c29b849e0..554903de4df 100644
--- a/src/mongo/db/concurrency/d_concurrency_bm.cpp
+++ b/src/mongo/db/concurrency/d_concurrency_bm.cpp
@@ -42,6 +42,28 @@ namespace {
 
 const int kMaxPerfThreads = 16;  // max number of threads to use for lock perf
 
+class LockerImplClientObserver : public ServiceContext::ClientObserver {
+public:
+    LockerImplClientObserver() = default;
+    ~LockerImplClientObserver() = default;
+
+    void onCreateClient(Client* client) final {}
+
+    void onDestroyClient(Client* client) final {}
+
+    void onCreateOperationContext(OperationContext* opCtx) override {
+        opCtx->setLockState(std::make_unique<LockerImpl>());
+    }
+
+    void onDestroyOperationContext(OperationContext* opCtx) final {}
+};
+
+const ServiceContext::ConstructorActionRegisterer clientObserverRegisterer{
+    "DConcurrencyTestClientObserver",
+    [](ServiceContext* service) {
+        service->registerClientObserver(std::make_unique<LockerImplClientObserver>());
+    },
+    [](ServiceContext* serviceContext) {}};
 
 class DConcurrencyTest : public benchmark::Fixture {
 public:
@@ -55,7 +77,6 @@ public:
             auto client = getGlobalServiceContext()->makeClient(str::stream()
                                                                 << "test client for thread " << i);
             auto opCtx = client->makeOperationContext();
-            client->swapLockState(std::make_unique<LockerImpl>());
             clients.emplace_back(std::move(client), std::move(opCtx));
         }
     }