SERVER-13770 Helpers::removeRange should check all runner states

(cherry picked from commit 94ff38a9c47047f0f86fd1ae2bbfa1f3a201aa6e)

Conflicts:
	src/mongo/db/dbhelpers.cpp

1 files changed, 18 insertions, 0 deletions

diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp
index 48677c5f218..6a6156b8723 100644
--- a/src/mongo/db/dbhelpers.cpp
+++ b/src/mongo/db/dbhelpers.cpp
@@ -38,6 +38,7 @@
 
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/db.h"
+#include "mongo/db/exec/working_set_common.h"
 #include "mongo/db/json.h"
 #include "mongo/db/index/btree_access_method.h"
 #include "mongo/db/ops/delete.h"
@@ -387,6 +388,23 @@ namespace mongo {
                 runner.reset();
                 if (Runner::RUNNER_EOF == state) { break; }
 
+                if (Runner::RUNNER_DEAD == state) {
+                    warning() << "cursor died: aborting deletion for "
+                              << min << " to " << max << " in " << ns
+                              << endl;
+                    break;
+                }
+
+                if (Runner::RUNNER_ERROR == state) {
+                    warning() << "cursor error while trying to delete "
+                              << min << " to " << max
+                              << " in " << ns << ": "
+                              << WorkingSetCommon::toStatusString(obj) << endl;
+                    break;
+                }
+
+                verify(Runner::RUNNER_ADVANCED == state);
+
                 int newYieldCount = c.curop()->numYields();
                 if (oldYieldCount != newYieldCount && !_isMaster()) {
                     warning() << "current node is not primary anymore, "