SERVER-31436 dropDatabase ensures writes are still accepted before finishing database drop

1 files changed, 14 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp
index 1df925e5b49..ff526a9feda 100644
--- a/src/mongo/db/catalog/drop_database.cpp
+++ b/src/mongo/db/catalog/drop_database.cpp
@@ -224,6 +224,20 @@ Status dropDatabase(OperationContext* opCtx, const std::string& dbName) {
 
     return writeConflictRetry(opCtx, "dropDatabase_database", dbName, [&] {
         Lock::GlobalWrite lk(opCtx);
+
+        bool userInitiatedWritesAndNotPrimary =
+            opCtx->writesAreReplicated() && !replCoord->canAcceptWritesForDatabase(opCtx, dbName);
+
+        if (userInitiatedWritesAndNotPrimary) {
+            return Status(ErrorCodes::NotMaster,
+                          str::stream() << "Could not drop database " << dbName
+                                        << " because we transitioned from PRIMARY to "
+                                        << replCoord->getMemberState().toString()
+                                        << " while waiting for "
+                                        << numCollectionsToDrop
+                                        << " pending collection drop(s).");
+        }
+
         AutoGetDb autoDB(opCtx, dbName, MODE_X);
         if (auto db = autoDB.getDb()) {
             return _finishDropDatabase(opCtx, dbName, db);