SERVER-16867 Allow logOp() to throw before calling first non-rollback-safe logOp listener.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index f5f4e27b00c..b3e167e81b0 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -374,6 +374,10 @@ namespace {
                BSONObj* patt,
                bool* b,
                bool fromMigrate) {
+        if ( getGlobalReplicationCoordinator()->isReplEnabled() ) {
+            _logOp(txn, opstr, ns, 0, obj, patt, b, fromMigrate);
+        }
+
         try {
             // TODO SERVER-15192 remove this once all listeners are rollback-safe.
             class RollbackPreventer : public RecoveryUnit::Change {
@@ -384,11 +388,6 @@ namespace {
                 }
             };
             txn->recoveryUnit()->registerChange(new RollbackPreventer());
-
-            if ( getGlobalReplicationCoordinator()->isReplEnabled() ) {
-                _logOp(txn, opstr, ns, 0, obj, patt, b, fromMigrate);
-            }
-
             logOpForSharding(txn, opstr, ns, obj, patt, fromMigrate);
             logOpForDbHash(ns);
             getGlobalAuthorizationManager()->logOp(opstr, ns, obj, patt, b);