SERVER-13951 Use a WriteUnitOfWork for each document in update and delete

1 files changed, 13 insertions, 5 deletions

diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index e0269ecd146..6280be64f22 100644
--- a/src/mongo/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
@@ -622,6 +622,8 @@ namespace mongo {
                 }
             }
 
+            WriteUnitOfWork wunit(request.getOpCtx()->recoveryUnit());
+
             // Save state before making changes
             exec->saveState();
 
@@ -679,6 +681,8 @@ namespace mongo {
                       NULL, request.isFromMigration());
             }
 
+            wunit.commit();
+
             // Only record doc modifications if they wrote (exclude no-ops)
             if (docWasModified)
                 opDebug->nModified++;
@@ -774,6 +778,13 @@ namespace mongo {
                                      driver->modOptions()) );
         }
 
+        // Insert the doc
+        BSONObj newObj = doc.getObject();
+        uassert(17420,
+                str::stream() << "Document to upsert is larger than " << BSONObjMaxUserSize,
+                newObj.objsize() <= BSONObjMaxUserSize);
+
+        WriteUnitOfWork wunit(request.getOpCtx()->recoveryUnit());
         // Only create the collection if the doc will be inserted.
         if (!collection) {
             collection = db->getCollection(request.getOpCtx(), request.getNamespaceString().ns());
@@ -782,11 +793,6 @@ namespace mongo {
             }
         }
 
-        // Insert the doc
-        BSONObj newObj = doc.getObject();
-        uassert(17420,
-                str::stream() << "Document to upsert is larger than " << BSONObjMaxUserSize,
-                newObj.objsize() <= BSONObjMaxUserSize);
 
         StatusWith<DiskLoc> newLoc = collection->insertDocument(request.getOpCtx(),
                                                                 newObj,
@@ -802,6 +808,8 @@ namespace mongo {
                         request.isFromMigration());
         }
 
+        wunit.commit();
+
         opDebug->nMatched = 1;
         return UpdateResult(false /* updated a non existing document */,
                             !driver->isDocReplacement() /* $mod or obj replacement? */,