SERVER-60144 Handle stale routing info on mongos for sharded time-series collections

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp
index 54725eb7fb5..c9a42882944 100644
--- a/src/mongo/db/commands/list_indexes.cpp
+++ b/src/mongo/db/commands/list_indexes.cpp
@@ -74,8 +74,13 @@ IndexSpecsWithNamespaceString getIndexSpecsWithNamespaceString(OperationContext*
     // Since time-series collections don't have UUIDs, we skip the time-series lookup
     // if the target collection is specified as a UUID.
     if (const auto& origNss = origNssOrUUID.nss()) {
-        if (auto timeseriesOptions = timeseries::getTimeseriesOptions(opCtx, *origNss)) {
-            auto bucketsNss = origNss->makeTimeseriesBucketsNamespace();
+        auto isCommandOnTimeseriesBucketNamespace =
+            cmd.getIsTimeseriesNamespace() && *cmd.getIsTimeseriesNamespace();
+        if (auto timeseriesOptions = timeseries::getTimeseriesOptions(
+                opCtx, *origNss, !isCommandOnTimeseriesBucketNamespace)) {
+            auto bucketsNss = isCommandOnTimeseriesBucketNamespace
+                ? *origNss
+                : origNss->makeTimeseriesBucketsNamespace();
             AutoGetCollectionForReadCommandMaybeLockFree autoColl(opCtx, bucketsNss);
 
             const CollectionPtr& coll = autoColl.getCollection();