SERVER-33516 Make _configsvrCreateCollection take the db distlock to prevent conncurrent movePrimary

1 files changed, 13 insertions, 1 deletions

diff --git a/src/mongo/db/s/config/configsvr_create_collection_command.cpp b/src/mongo/db/s/config/configsvr_create_collection_command.cpp
index 7eba3758208..8745aeff00a 100644
--- a/src/mongo/db/s/config/configsvr_create_collection_command.cpp
+++ b/src/mongo/db/s/config/configsvr_create_collection_command.cpp
@@ -88,8 +88,12 @@ public:
         return Status::OK();
     }
 
+    std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override {
+        return CommandHelpers::parseNsFullyQualified(dbname, cmdObj);
+    }
+
     bool run(OperationContext* opCtx,
-             const std::string& dbname,
+             const std::string& dbname_unused,
              const BSONObj& cmdObj,
              BSONObjBuilder& result) override {
 
@@ -113,6 +117,14 @@ public:
             uassertStatusOK(options.parse(*requestOptions));
         }
 
+        auto const catalogClient = Grid::get(opCtx)->catalogClient();
+        const NamespaceString nss(parseNs(dbname_unused, cmdObj));
+
+        auto dbDistLock = uassertStatusOK(catalogClient->getDistLockManager()->lock(
+            opCtx, nss.db(), "createCollection", DistLockManager::kDefaultLockTimeout));
+        auto collDistLock = uassertStatusOK(catalogClient->getDistLockManager()->lock(
+            opCtx, nss.ns(), "createCollection", DistLockManager::kDefaultLockTimeout));
+
         ShardingCatalogManager::get(opCtx)->createCollection(opCtx, createCmd.getNs(), options);
 
         return true;