SERVER-21001: retry collection create on write conflict

1 files changed, 12 insertions, 9 deletions

diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp
index 02adb946a29..251b8af52fe 100644
--- a/src/mongo/db/commands/write_commands/batch_executor.cpp
+++ b/src/mongo/db/commands/write_commands/batch_executor.cpp
@@ -960,16 +960,19 @@ bool WriteBatchExecutor::ExecInsertsState::_lockAndCheckImpl(WriteOpResult* resu
             return _lockAndCheckImpl(result, false);
         }
 
-        WriteUnitOfWork wunit(txn);
-        // Implicitly create if it doesn't exist
-        _collection = _database->createCollection(txn, request->getTargetingNS());
-        if (!_collection) {
-            result->setError(
-                toWriteError(Status(ErrorCodes::InternalError,
-                                    "could not create collection " + request->getTargetingNS())));
-            return false;
+        MONGO_WRITE_CONFLICT_RETRY_LOOP_BEGIN {
+            WriteUnitOfWork wunit(txn);
+            // Implicitly create if it doesn't exist
+            _collection = _database->createCollection(txn, request->getTargetingNS());
+            if (!_collection) {
+                result->setError(toWriteError(
+                    Status(ErrorCodes::InternalError,
+                           "could not create collection " + request->getTargetingNS())));
+                return false;
+            }
+            wunit.commit();
         }
-        wunit.commit();
+        MONGO_WRITE_CONFLICT_RETRY_LOOP_END(txn, "createCollection", request->getTargetingNS());
     }
     return true;
 }