SERVER-58049: Move change streams invalidation logic in ARM to

scheduleGetMores.

1 files changed, 4 insertions, 9 deletions

diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp
index 236729e2359..ed7da3a2545 100644
--- a/src/mongo/s/query/async_results_merger.cpp
+++ b/src/mongo/s/query/async_results_merger.cpp
@@ -489,15 +489,15 @@ Status AsyncResultsMerger::_askForNextBatch(WithLock, size_t remoteIndex) {
 
 Status AsyncResultsMerger::scheduleGetMores() {
     stdx::lock_guard<Latch> lk(_mutex);
+    return _scheduleGetMores(lk);
+}
 
+Status AsyncResultsMerger::_scheduleGetMores(WithLock lk) {
+    // Before scheduling more work, check whether the cursor has been invalidated.
     if (feature_flags::gFeatureFlagChangeStreamsOptimization.isEnabledAndIgnoreFCV()) {
         _assertNotInvalidated(lk);
     }
 
-    return _scheduleGetMores(lk);
-}
-
-Status AsyncResultsMerger::_scheduleGetMores(WithLock lk) {
     // Schedule remote work on hosts for which we need more results.
     for (size_t i = 0; i < _remotes.size(); ++i) {
         auto& remote = _remotes[i];
@@ -542,11 +542,6 @@ StatusWith<executor::TaskExecutor::EventHandle> AsyncResultsMerger::nextEvent()
                       "nextEvent() called before an outstanding event was signaled");
     }
 
-    // Check if the cursor should be invalidated.
-    if (feature_flags::gFeatureFlagChangeStreamsOptimization.isEnabledAndIgnoreFCV()) {
-        _assertNotInvalidated(lk);
-    }
-
     auto getMoresStatus = _scheduleGetMores(lk);
     if (!getMoresStatus.isOK()) {
         return getMoresStatus;