New upstream version 6.0.20upstream

1 files changed, 15 insertions, 0 deletions

diff --git a/src/mongo/s/query/blocking_results_merger_test.cpp b/src/mongo/s/query/blocking_results_merger_test.cpp
index 15e37b0460d..41dd31b895e 100644
--- a/src/mongo/s/query/blocking_results_merger_test.cpp
+++ b/src/mongo/s/query/blocking_results_merger_test.cpp
@@ -292,5 +292,20 @@ TEST_F(ResultsMergerTestFixture, ShouldBeAbleToHandleExceptionWhenUnyielding) {
     future.default_timed_get();
 }
 
+TEST_F(ResultsMergerTestFixture, CanAccessAsyncResultsMergerParams) {
+    std::vector<RemoteCursor> cursors;
+    cursors.emplace_back(
+        makeRemoteCursor(kTestShardIds[0], kTestShardHosts[0], CursorResponse(kTestNss, 1, {})));
+    auto params = makeARMParamsFromExistingCursors(std::move(cursors));
+    BlockingResultsMerger blockingMerger(
+        operationContext(), std::move(params), executor(), nullptr);
+
+    ASSERT_EQ(kTestNss, blockingMerger.asyncResultsMergerParams().getNss());
+    ASSERT_EQ(1, blockingMerger.asyncResultsMergerParams().getRemotes().size());
+
+    // Kill merger because otherwise it will run into an assertion in its dtor.
+    blockingMerger.kill(operationContext());
+}
+
 }  // namespace
 }  // namespace mongo