SERVER-20036 Interrupt mapReduce and movePrimary commands on catalog manager change

1 files changed, 9 insertions, 2 deletions

diff --git a/src/mongo/db/cloner.h b/src/mongo/db/cloner.h
index 5a89f191dd1..e0e9ba306c4 100644
--- a/src/mongo/db/cloner.h
+++ b/src/mongo/db/cloner.h
@@ -30,8 +30,9 @@
 
 #pragma once
 
-#include "mongo/client/dbclientinterface.h"
 #include "mongo/base/disallow_copying.h"
+#include "mongo/client/dbclientinterface.h"
+#include "mongo/s/catalog/catalog_manager.h"
 
 namespace mongo {
 
@@ -73,7 +74,7 @@ private:
               const BSONObj& from_opts,
               const NamespaceString& to_ns,
               bool masterSameProcess,
-              bool slaveOk,
+              const CloneOptions& opts,
               Query q);
 
     void copyIndexes(OperationContext* txn,
@@ -94,6 +95,10 @@ private:
  *  snapshot    - use snapshot mode for copying collections.  note this should not be used
  *                when it isn't required, as it will be slower.  for example,
  *                repairDatabase need not use it.
+ *  checkForCatalogChange - Internal option set for clone commands initiated by a mongos that are
+ *                holding a distributed lock (such as movePrimary).  Indicates that we need to
+ *                be periodically checking to see if the catalog manager has swapped and fail
+ *                if it has so that we don't block the mongos that initiated the command.
  */
 struct CloneOptions {
     std::string fromDB;
@@ -105,6 +110,8 @@ struct CloneOptions {
 
     bool syncData = true;
     bool syncIndexes = true;
+    bool checkForCatalogChange = false;
+    CatalogManager::ConfigServerMode initialCatalogMode = CatalogManager::ConfigServerMode::NONE;
 };
 
 }  // namespace mongo