SERVER-30733 make distlocks hierarchical for metadata commands on databases and collections

1 files changed, 10 insertions, 0 deletions

diff --git a/src/mongo/db/s/config/configsvr_create_database_command.cpp b/src/mongo/db/s/config/configsvr_create_database_command.cpp
index f752ffa6a18..567216846d9 100644
--- a/src/mongo/db/s/config/configsvr_create_database_command.cpp
+++ b/src/mongo/db/s/config/configsvr_create_database_command.cpp
@@ -115,6 +115,16 @@ public:
         // Make sure to force update of any stale metadata
         ON_BLOCK_EXIT([opCtx, dbname] { Grid::get(opCtx)->catalogCache()->purgeDatabase(dbname); });
 
+        // Remove the backwards compatible lock after 3.6 ships.
+        auto const catalogClient = Grid::get(opCtx)->catalogClient();
+        auto backwardsCompatibleDbDistLock = uassertStatusOK(
+            catalogClient->getDistLockManager()->lock(opCtx,
+                                                      dbname + "-movePrimary",
+                                                      "createDatabase",
+                                                      DistLockManager::kDefaultLockTimeout));
+        auto dbDistLock = uassertStatusOK(catalogClient->getDistLockManager()->lock(
+            opCtx, dbname, "createDatabase", DistLockManager::kDefaultLockTimeout));
+
         uassertStatusOK(ShardingCatalogManager::get(opCtx)->createDatabase(opCtx, dbname));
 
         return true;