SERVER-13053 track index builds explicitly instead of using CurOp

1 files changed, 9 insertions, 3 deletions

diff --git a/src/mongo/db/index_builder.h b/src/mongo/db/index_builder.h
index 621ea8e11cf..c3d042b5cea 100644
--- a/src/mongo/db/index_builder.h
+++ b/src/mongo/db/index_builder.h
@@ -30,6 +30,7 @@
 
 #include <string>
 
+#include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/client.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/util/background.h"
@@ -39,6 +40,8 @@
  */
 namespace mongo {
 
+    class Collection;
+
     class IndexBuilder : public BackgroundJob {
     public:
         IndexBuilder(const BSONObj& index);
@@ -54,10 +57,13 @@ namespace mongo {
         Status build( Client::Context& context ) const;
 
         /**
-         * Kill all in-progress indexes matching criteria and, optionally, store them in the
-         * indexes list.
+         * Kill all in-progress indexes matching criteria, if non-empty:
+         * index ns, index name, and/or index key spec.
+         * Returns a vector of the indexes that were killed.
          */
-        static std::vector<BSONObj> killMatchingIndexBuilds(const BSONObj& criteria);
+        static std::vector<BSONObj> 
+            killMatchingIndexBuilds(Collection* collection,
+                                    const IndexCatalog::IndexKillCriteria& criteria);
 
         /**
          * Retry all index builds in the list. Builds each index in a separate thread. If ns does