SERVER-47336 Reset stale shards under catalog cache mutex when returning back the same routing history

2 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index d80d5befe14..493b16a3690 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -786,7 +786,13 @@ void CatalogCache::_scheduleCollectionRefresh(WithLock lk,
             }
             itDb->second.erase(nss.ns());
             return;
+        } else if (existingRoutingInfo &&
+                   existingRoutingInfo->getSequenceNumber() ==
+                       newRoutingInfo->getSequenceNumber()) {
+            // If the routingInfo hasn't changed, we need to manually reset stale shards.
+            newRoutingInfo->setAllShardsRefreshed();
         }
+
         collEntry->routingInfo = std::move(newRoutingInfo);
     };
 
diff --git a/src/mongo/s/chunk_manager.cpp b/src/mongo/s/chunk_manager.cpp
index d256f994733..aa0eb056623 100644
--- a/src/mongo/s/chunk_manager.cpp
+++ b/src/mongo/s/chunk_manager.cpp
@@ -636,7 +636,6 @@ std::shared_ptr<RoutingTableHistory> RoutingTableHistory::makeUpdated(
     // sequence number to detect batch writes not making progress because of chunks moving across
     // shards too frequently.
     if (collectionVersion == startingCollectionVersion) {
-        setAllShardsRefreshed();
         return shared_from_this();
     }