SERVER-13575 log rollback operation progress every 10 seconds

also stop double counting deletes from non-capped collections

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index efdcee062a2..9d07024e16a 100644
--- a/src/mongo/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
@@ -493,9 +493,18 @@ namespace repl {
         map<string,shared_ptr<Helpers::RemoveSaver> > removeSavers;
 
         unsigned deletes = 0, updates = 0;
+        time_t lastProgressUpdate = time(0);
+        time_t progressUpdateGap = 10;
         for (list<pair<DocID, BSONObj> >::iterator it = goodVersions.begin();
                 it != goodVersions.end();
                 it++) {
+            time_t now = time(0);
+            if (now - lastProgressUpdate > progressUpdateGap) {
+                log() << "replSet " << deletes << " delete and "
+                      << updates << " update operations processed out of "
+                      << goodVersions.size() << " total operations";
+                lastProgressUpdate = now;
+            }
             const DocID& doc = it->first;
             BSONObj pattern = doc._id.wrap(); // { _id : ... }
             try {
@@ -566,7 +575,6 @@ namespace repl {
                             }
                         }
                         else {
-                            deletes++;
                             deleteObjects(&txn, 
                                           ctx.db(),
                                           doc.ns,