SERVER-2771 Make foreground indexes not create a client

hww3 · Dec 27, 2012 · 283fc0d · 283fc0d
1 parent b012f05
commit 283fc0d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp
@@ -44,10 +44,16 @@ namespace mongo {
         Client::WriteContext ctx(_ns);
         theDataFileMgr.insert(_ns.c_str(), _index.objdata(), _index.objsize(),
                               true /* mayInterrupt */);
+        build();
 
         cc().shutdown();
     }
 
+    void IndexBuilder::build() const {
+        theDataFileMgr.insert(_ns.c_str(), _index.objdata(), _index.objsize(),
+                              true /* mayInterrupt */);
+    }
+
     std::vector<BSONObj> IndexBuilder::killMatchingIndexBuilds(const BSONObj& criteria) {
         std::vector<BSONObj> indexes;
         CurOp* op = NULL;

diff --git a/src/mongo/db/index_builder.h b/src/mongo/db/index_builder.h
@@ -34,6 +34,8 @@ namespace mongo {
         virtual void run();
         virtual std::string name() const;
 
+        void build() const;
+
         /**
          * Kill all in-progress indexes matching criteria and, optionally, store them in the
          * indexes list.

diff --git a/src/mongo/db/oplog.cpp b/src/mongo/db/oplog.cpp
@@ -775,7 +775,7 @@ namespace mongo {
                 else {
                     IndexBuilder builder(ns, o);
                     // Finish the foreground build before returning
-                    builder.run();
+                    builder.build();
                 }
             }
             else {