SERVER-36473 Make a dedicated RAII class to manage Client lifetime

1 files changed, 15 insertions, 5 deletions

diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp
index 1ac7d548bd2..da08647395b 100644
--- a/src/mongo/db/client.cpp
+++ b/src/mongo/db/client.cpp
@@ -88,11 +88,6 @@ void Client::initThread(StringData desc,
     currentClient = service->makeClient(fullDesc, std::move(session));
 }
 
-void Client::destroy() {
-    invariant(haveClient());
-    currentClient.reset(nullptr);
-}
-
 namespace {
 int64_t generateSeed(const std::string& desc) {
     size_t seed = 0;
@@ -169,4 +164,19 @@ void Client::setCurrent(ServiceContext::UniqueClient client) {
     currentClient = std::move(client);
 }
 
+ThreadClient::ThreadClient(ServiceContext* serviceContext)
+    : ThreadClient(getThreadName(), serviceContext, nullptr) {}
+
+ThreadClient::ThreadClient(StringData desc,
+                           ServiceContext* serviceContext,
+                           transport::SessionHandle session) {
+    invariant(!currentClient);
+    Client::initThread(desc, serviceContext, std::move(session));
+}
+
+ThreadClient::~ThreadClient() {
+    invariant(currentClient);
+    currentClient.reset(nullptr);
+}
+
 }  // namespace mongo