SERVER-17689: handle wce better in initial sync

1 files changed, 19 insertions, 17 deletions

diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index ffdc244e42c..ab2a48a72fb 100644
--- a/src/mongo/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
@@ -40,6 +40,7 @@
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/concurrency/d_concurrency.h"
+#include "mongo/db/concurrency/write_conflict_exception.h"
 #include "mongo/db/exec/update.h"
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/db/op_observer.h"
@@ -75,23 +76,24 @@ namespace mongo {
                       locker->isLockHeldForMode(ResourceId(RESOURCE_DATABASE, nsString.db()),
                                                 MODE_X));
 
-            ScopedTransaction transaction(txn, MODE_IX);
-            Lock::DBLock lk(txn->lockState(), nsString.db(), MODE_X);
-
-            bool userInitiatedWritesAndNotPrimary = txn->writesAreReplicated() &&
-                !repl::getGlobalReplicationCoordinator()->canAcceptWritesForDatabase(nsString.db());
-
-            if (userInitiatedWritesAndNotPrimary) {
-                uassertStatusOK(Status(ErrorCodes::NotMaster, str::stream()
-                    << "Not primary while creating collection " << nsString.ns()
-                    << " during upsert"));
-            }
-
-            WriteUnitOfWork wuow(txn);
-            collection = db->createCollection(txn, nsString.ns(), CollectionOptions());
-            invariant(collection);
-
-            wuow.commit();
+            MONGO_WRITE_CONFLICT_RETRY_LOOP_BEGIN {
+                ScopedTransaction transaction(txn, MODE_IX);
+                Lock::DBLock lk(txn->lockState(), nsString.db(), MODE_X);
+
+                const bool userInitiatedWritesAndNotPrimary = txn->writesAreReplicated() &&
+                        !repl::getGlobalReplicationCoordinator()->canAcceptWritesForDatabase(
+                                                                                    nsString.db());
+
+                if (userInitiatedWritesAndNotPrimary) {
+                    uassertStatusOK(Status(ErrorCodes::NotMaster, str::stream()
+                        << "Not primary while creating collection " << nsString.ns()
+                        << " during upsert"));
+                }
+                WriteUnitOfWork wuow(txn);
+                collection = db->createCollection(txn, nsString.ns(), CollectionOptions());
+                invariant(collection);
+                wuow.commit();
+            } MONGO_WRITE_CONFLICT_RETRY_LOOP_END(txn, "createCollection", nsString.ns());
         }
 
         // Parse the update, get an executor for it, run the executor, get stats out.