SERVER-42833 Make _configsvrRenameCollection return an error if the source and target collections are on different primary shards.

2 files changed, 17 insertions, 1 deletions

diff --git a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
index bfbd17c2968..12192c7c7b4 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
@@ -495,6 +495,20 @@ void ShardingCatalogManager::renameCollection(OperationContext* opCtx,
     const NamespaceString& nssTarget = request.getTo();
     const auto catalogClient = Grid::get(opCtx)->catalogClient();
 
+    const auto dbTypeSource =
+        uassertStatusOK(
+            Grid::get(opCtx)->catalogClient()->getDatabase(
+                opCtx, nssSource.db().toString(), repl::ReadConcernArgs::get(opCtx).getLevel()))
+            .value;
+    const auto dbTypeTarget =
+        uassertStatusOK(
+            Grid::get(opCtx)->catalogClient()->getDatabase(
+                opCtx, nssTarget.db().toString(), repl::ReadConcernArgs::get(opCtx).getLevel()))
+            .value;
+    uassert(ErrorCodes::IllegalOperation,
+            "Source and target cannot be on different namespaces.",
+            dbTypeSource.getPrimary() == dbTypeTarget.getPrimary());
+
     ShardsvrRenameCollection shardsvrRenameCollectionRequest;
     shardsvrRenameCollectionRequest.setRenameCollection(nssSource);
     shardsvrRenameCollectionRequest.setTo(nssTarget);
diff --git a/src/mongo/s/catalog/sharding_catalog_client_impl.cpp b/src/mongo/s/catalog/sharding_catalog_client_impl.cpp
index a070397e08f..501f24f39a0 100644
--- a/src/mongo/s/catalog/sharding_catalog_client_impl.cpp
+++ b/src/mongo/s/catalog/sharding_catalog_client_impl.cpp
@@ -372,8 +372,10 @@ std::vector<NamespaceString> ShardingCatalogClientImpl::getAllShardedCollections
 
     std::vector<NamespaceString> collectionsToReturn;
     for (const auto& coll : collectionsOnConfig) {
-        if (coll.getDropped())
+        if (coll.getDropped() ||
+            coll.getDistributionMode() == CollectionType::DistributionMode::kUnsharded) {
             continue;
+        }
 
         collectionsToReturn.push_back(coll.getNs());
     }