SERVER-18171: Rename commitAndRestart to abandonSnapshot

3 files changed, 4 insertions, 4 deletions

diff --git a/src/mongo/db/catalog/apply_ops.cpp b/src/mongo/db/catalog/apply_ops.cpp
index 7f33c477981..9292fbcbf32 100644
--- a/src/mongo/db/catalog/apply_ops.cpp
+++ b/src/mongo/db/catalog/apply_ops.cpp
@@ -192,7 +192,7 @@ namespace mongo {
                 catch (const WriteConflictException& wce) {
                     LOG(2) <<
                         "WriteConflictException while logging applyOps command, retrying.";
-                    txn->recoveryUnit()->commitAndRestart();
+                    txn->recoveryUnit()->abandonSnapshot();
                     continue;
                 }
             }
diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp
index 0b6a4c1697b..1ac2e3f1c58 100644
--- a/src/mongo/db/catalog/database.cpp
+++ b/src/mongo/db/catalog/database.cpp
@@ -271,7 +271,7 @@ namespace mongo {
             catch (const WriteConflictException& exp) {
                 warning() << "could not drop temp collection '" << ns << "' due to "
                     "WriteConflictException";
-                txn->recoveryUnit()->commitAndRestart();
+                txn->recoveryUnit()->abandonSnapshot();
             }
         }
     }
diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp
index 658978eb1bd..31a32352a11 100644
--- a/src/mongo/db/catalog/index_create.cpp
+++ b/src/mongo/db/catalog/index_create.cpp
@@ -305,9 +305,9 @@ namespace mongo {
                 wce.logAndBackoff(retries, "index creation", _collection->ns().ns());
 
                 // Can't use WRITE_CONFLICT_RETRY_LOOP macros since we need to save/restore exec
-                // around call to commitAndRestart.
+                // around call to abandonSnapshot.
                 exec->saveState();
-                _txn->recoveryUnit()->commitAndRestart();
+                _txn->recoveryUnit()->abandonSnapshot();
                 exec->restoreState(_txn); // Handles any WCEs internally.
             }
         }