SERVER-28298 Allow OperationContext objects to be created with an optional LogicalSessionId

1 files changed, 37 insertions, 0 deletions

diff --git a/src/mongo/db/operation_context_test.cpp b/src/mongo/db/operation_context_test.cpp
index 95f53cf8053..33e23f45593 100644
--- a/src/mongo/db/operation_context_test.cpp
+++ b/src/mongo/db/operation_context_test.cpp
@@ -28,7 +28,10 @@
 
 #include "mongo/platform/basic.h"
 
+#include <boost/optional.hpp>
+
 #include "mongo/db/client.h"
+#include "mongo/db/logical_session_id.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/service_context_noop.h"
@@ -69,6 +72,40 @@ std::ostream& operator<<(std::ostream& os, stdx::future_status futureStatus) {
     }
 }
 
+TEST(OperationContextTest, CanHaveLogicalSessionId) {
+    // Test that we can create opCtx's with or without a logical session id
+    auto serviceCtx = stdx::make_unique<ServiceContextNoop>();
+    auto client = serviceCtx->makeClient("OperationContextTest");
+
+    // No session id
+    {
+        auto opCtx = client->makeOperationContext();
+        ASSERT(!opCtx->getLogicalSessionId());
+    }
+
+    {
+        auto opCtx = serviceCtx->makeOperationContext(client.get());
+        ASSERT(!opCtx->getLogicalSessionId());
+    }
+
+    // With a session id
+    auto res = LogicalSessionId::parse("00000000-abab-4000-8000-000000000000");
+    ASSERT(res.isOK());
+    auto lsid = res.getValue();
+
+    {
+        auto opCtx = client->makeOperationContext(lsid);
+        ASSERT(opCtx->getLogicalSessionId());
+        ASSERT_EQUALS(*(opCtx->getLogicalSessionId()), lsid);
+    }
+
+    {
+        auto opCtx = serviceCtx->makeOperationContext(client.get(), lsid);
+        ASSERT(opCtx->getLogicalSessionId());
+        ASSERT_EQUALS(*(opCtx->getLogicalSessionId()), lsid);
+    }
+}
+
 class OperationDeadlineTests : public unittest::Test {
 public:
     void setUp() {