SERVER-8344 Rebuild indexes before listening

mongodb · Feb 11, 2013 · 39d99f0 · 39d99f0
1 parent 8813bd3
commit 39d99f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
@@ -663,7 +663,7 @@ namespace mongo {
         /* this is for security on certain platforms (nonce generation) */
         srand((unsigned) (curTimeMicros() ^ startupSrandTimer.micros()));
 
-        indexRebuilder.go();
+        indexRebuilder.run();
 
         snapshotThread.go();
         d.clientCursorMonitor.go();

diff --git a/src/mongo/db/index_rebuilder.cpp b/src/mongo/db/index_rebuilder.cpp
@@ -26,10 +26,6 @@ namespace mongo {
 
     IndexRebuilder::IndexRebuilder() {}
 
-    std::string IndexRebuilder::name() const {
-        return "IndexRebuilder";
-    }
-
     /**
      * This resets memory tracking to its original value after all indexes are rebuilt.
      *
@@ -48,14 +44,11 @@ namespace mongo {
         ON_BLOCK_EXIT(resetMemoryTracking, Record::MemoryTrackingEnabled);
         Record::MemoryTrackingEnabled = false;
 
-        Client::initThread(name().c_str());
         Client::GodScope gs;
-        std::vector<std::string> dbNames;
+        Lock::GlobalWrite lk;
 
-        {
-            Lock::GlobalWrite lk;
-            getDatabaseNames(dbNames);
-        }
+        std::vector<std::string> dbNames;
+        getDatabaseNames(dbNames);
 
         for (std::vector<std::string>::const_iterator it = dbNames.begin();
              it < dbNames.end();

diff --git a/src/mongo/db/index_rebuilder.h b/src/mongo/db/index_rebuilder.h
@@ -17,11 +17,10 @@
 #pragma once
 
 #include "mongo/db/namespace_details.h"
-#include "mongo/util/background.h"
 
 namespace mongo {
 
-    class IndexRebuilder : public BackgroundJob {
+    class IndexRebuilder {
     public:
         IndexRebuilder();
 

diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
@@ -19,7 +19,6 @@
 
 #include "mongo/db/client.h"
 #include "mongo/db/cloner.h"
-#include "mongo/db/index_rebuilder.h"
 #include "mongo/db/ops/update.h"
 #include "mongo/db/ops/delete.h"
 #include "mongo/db/repl/rs.h"
@@ -575,12 +574,6 @@ namespace mongo {
     }
 
     void ReplSetImpl::syncRollback(OplogReader&r) {
-        // If this is startup, wait for any index build retries to finish first
-        while (indexRebuilder.getState() != BackgroundJob::Done) {
-            OCCASIONALLY LOG(0) << "replSet rollback waiting for index rebuild to finish" << endl;
-            indexRebuilder.wait(1000);
-        }
-
         // check that we are at minvalid, otherwise we cannot rollback as we may be in an
         // inconsistent state
         {