SERVER-33991 Pass txnNumber in getMore requests through mongos

1 files changed, 18 insertions, 0 deletions

diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp
index 45403399e8c..3e41a36c089 100644
--- a/src/mongo/s/query/async_results_merger.cpp
+++ b/src/mongo/s/query/async_results_merger.cpp
@@ -94,6 +94,10 @@ AsyncResultsMerger::AsyncResultsMerger(OperationContext* opCtx,
       _mergeQueue(MergingComparator(_remotes,
                                     _params.getSort() ? *_params.getSort() : BSONObj(),
                                     _params.getCompareWholeSortKey())) {
+    if (params.getTxnNumber()) {
+        invariant(params.getSessionId());
+    }
+
     size_t remoteIndex = 0;
     for (const auto& remote : _params.getRemotes()) {
         _remotes.emplace_back(remote.getHostAndPort(),
@@ -352,6 +356,20 @@ Status AsyncResultsMerger::_askForNextBatch(WithLock, size_t remoteIndex) {
                                     boost::none)
                          .toBSON();
 
+    if (_params.getSessionId()) {
+        BSONObjBuilder newCmdBob(std::move(cmdObj));
+
+        BSONObjBuilder lsidBob(newCmdBob.subobjStart(OperationSessionInfo::kSessionIdFieldName));
+        _params.getSessionId()->serialize(&lsidBob);
+        lsidBob.doneFast();
+
+        if (_params.getTxnNumber()) {
+            newCmdBob.append(OperationSessionInfo::kTxnNumberFieldName, *_params.getTxnNumber());
+        }
+
+        cmdObj = newCmdBob.obj();
+    }
+
     executor::RemoteCommandRequest request(
         remote.getTargetHost(), _params.getNss().db().toString(), cmdObj, _opCtx);