SERVER-37444 Added RequiresCollectionStage and use for COLLSCAN.

This is a pure refactor with no user-facing changes. It is
the first step in making PlanExecutors check their own
validity during yield recovery, rather than requiring the
invalidating actor to issue a kill notification.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/mongo/db/catalog/multi_index_block_impl.cpp b/src/mongo/db/catalog/multi_index_block_impl.cpp
index 87a851f9c1d..32be5a0e4a7 100644
--- a/src/mongo/db/catalog/multi_index_block_impl.cpp
+++ b/src/mongo/db/catalog/multi_index_block_impl.cpp
@@ -400,9 +400,10 @@ Status MultiIndexBlockImpl::insertAllDocumentsInCollection() {
             }
             wunit.commit();
             if (_buildInBackground) {
-                auto restoreStatus = exec->restoreState();  // Handles any WCEs internally.
-                if (!restoreStatus.isOK()) {
-                    return restoreStatus;
+                try {
+                    exec->restoreState();  // Handles any WCEs internally.
+                } catch (...) {
+                    return exceptionToStatus();
                 }
             }
 
@@ -422,9 +423,10 @@ Status MultiIndexBlockImpl::insertAllDocumentsInCollection() {
             // abandonSnapshot.
             exec->saveState();
             _opCtx->recoveryUnit()->abandonSnapshot();
-            auto restoreStatus = exec->restoreState();  // Handles any WCEs internally.
-            if (!restoreStatus.isOK()) {
-                return restoreStatus;
+            try {
+                exec->restoreState();  // Handles any WCEs internally.
+            } catch (...) {
+                return exceptionToStatus();
             }
         }
     }