SERVER-17037 syncApply should reset the current op in the beginning

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index e09d2e706c5..954eba9b2b1 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -119,12 +119,17 @@ namespace repl {
     /* apply the log op that is in param o
        @return bool success (true) or failure (false)
     */
-    bool SyncTail::syncApply(
-                        OperationContext* txn, const BSONObj &op, bool convertUpdateToUpsert) {
+    bool SyncTail::syncApply(OperationContext* txn,
+                             const BSONObj &op,
+                             bool convertUpdateToUpsert) {
+
         if (inShutdown()) {
             return true;
         }
 
+        // Count each log op application as a separate operation, for reporting purposes
+        txn->getCurOp()->reset();
+
         const char *ns = op.getStringField("ns");
         verify(ns);
 
@@ -180,7 +185,6 @@ namespace repl {
                 }
 
                 Client::Context ctx(txn, ns);
-                ctx.getClient()->curop()->reset();
 
                 if ( createCollection == 0 &&
                      !isIndexBuild &&