SERVER-29700 add operationTime in all connections used by mongos

1 files changed, 11 insertions, 9 deletions

diff --git a/src/mongo/db/operation_time_tracker.cpp b/src/mongo/db/operation_time_tracker.cpp
index fc245db99ad..0b4d3dc677a 100644
--- a/src/mongo/db/operation_time_tracker.cpp
+++ b/src/mongo/db/operation_time_tracker.cpp
@@ -33,18 +33,20 @@
 
 namespace mongo {
 namespace {
-auto getOperationTimeTracker =
-    OperationContext::declareDecoration<std::shared_ptr<OperationTimeTracker>>();
-}
+struct OperationTimeTrackerHolder {
+    OperationTimeTrackerHolder() : opTimeTracker(std::make_shared<OperationTimeTracker>()) {}
+    static const OperationContext::Decoration<OperationTimeTrackerHolder> get;
+    std::shared_ptr<OperationTimeTracker> opTimeTracker;
+};
 
-std::shared_ptr<OperationTimeTracker> OperationTimeTracker::get(OperationContext* opCtx) {
-    return getOperationTimeTracker(opCtx);
+const OperationContext::Decoration<OperationTimeTrackerHolder> OperationTimeTrackerHolder::get =
+    OperationContext::declareDecoration<OperationTimeTrackerHolder>();
 }
 
-void OperationTimeTracker::set(OperationContext* opCtx,
-                               std::shared_ptr<OperationTimeTracker> trackerArg) {
-    auto& tracker = getOperationTimeTracker(opCtx);
-    tracker = std::move(trackerArg);
+std::shared_ptr<OperationTimeTracker> OperationTimeTracker::get(OperationContext* opCtx) {
+    auto timeTrackerHolder = OperationTimeTrackerHolder::get(opCtx);
+    invariant(timeTrackerHolder.opTimeTracker);
+    return timeTrackerHolder.opTimeTracker;
 }
 
 LogicalTime OperationTimeTracker::getMaxOperationTime() const {