SERVER-13643 Use TransactionExperiment in dropDatabase()

chandu121 · May 1, 2014 · e3a0652 · e3a0652
1 parent 4ac7bff
commit e3a0652
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 26 deletions.
diff --git a/src/mongo/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
@@ -215,7 +215,7 @@ namespace mongo {
                 log() << "dropDatabase " << dbname << " starting" << endl;
 
                 stopIndexBuilds(context.db(), cmdObj);
-                dropDatabase(context.db());
+                dropDatabase(&txn, context.db());
 
                 log() << "dropDatabase " << dbname << " finished";
 

diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
@@ -79,6 +79,7 @@ _ disallow system* manipulations from the database.
 #include "mongo/util/processinfo.h"
 #include "mongo/db/stats/timer_stats.h"
 #include "mongo/db/stats/counters.h"
+#include "mongo/db/storage/mmap_v1/dur_transaction.h"
 
 namespace mongo {
 
@@ -141,6 +142,7 @@ namespace mongo {
 
     void dropAllDatabasesExceptLocal() {
         Lock::GlobalWrite lk;
+        DurTransaction txn;
 
         vector<string> n;
         getDatabaseNames(n);
@@ -149,12 +151,12 @@ namespace mongo {
         for( vector<string>::iterator i = n.begin(); i != n.end(); i++ ) {
             if( *i != "local" ) {
                 Client::Context ctx(*i);
-                dropDatabase(ctx.db());
+                dropDatabase(&txn, ctx.db());
             }
         }
     }
 
-    void dropDatabase(Database* db ) {
+    void dropDatabase(TransactionExperiment* txn, Database* db ) {
         invariant( db );
 
         string name = db->name(); // just to have safe
@@ -173,7 +175,7 @@ namespace mongo {
         //
         //  RWLockRecursive::Exclusive lk(MongoFile::mmmutex);
 
-        getDur().syncDataAndTruncateJournal();
+        txn->syncDataAndTruncateJournal();
 
         Database::closeDatabase( name, db->path() );
         db = 0; // d is now deleted

diff --git a/src/mongo/db/pdfile.h b/src/mongo/db/pdfile.h
@@ -47,7 +47,7 @@ namespace mongo {
     class Database;
     class TransactionExperiment;
 
-    void dropDatabase(Database* db);
+    void dropDatabase(TransactionExperiment* txn, Database* db);
 
     Status userCreateNS( TransactionExperiment* txn,
                          Database* db,

diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
@@ -303,28 +303,28 @@ namespace mongo {
         uassert(17066, "Internal error reading from local.sources", Runner::RUNNER_EOF == state);
     }
 
-    bool ReplSource::throttledForceResyncDead( const char *requester ) {
+    bool ReplSource::throttledForceResyncDead( TransactionExperiment* txn, const char *requester ) {
         if ( time( 0 ) - lastForcedResync > 600 ) {
-            forceResyncDead( requester );
+            forceResyncDead( txn, requester );
             lastForcedResync = time( 0 );
             return true;
         }
         return false;
     }
 
-    void ReplSource::forceResyncDead( const char *requester ) {
+    void ReplSource::forceResyncDead( TransactionExperiment* txn, const char *requester ) {
         if ( !replAllDead )
             return;
         SourceVector sources;
         ReplSource::loadAll(sources);
         for( SourceVector::iterator i = sources.begin(); i != sources.end(); ++i ) {
             log() << requester << " forcing resync from "  << (*i)->hostName << endl;
-            (*i)->forceResync( requester );
+            (*i)->forceResync( txn, requester );
         }
         replAllDead = 0;
     }
 
-    void ReplSource::forceResync( const char *requester ) {
+    void ReplSource::forceResync( TransactionExperiment* txn, const char *requester ) {
         BSONObj info;
         {
             dbtemprelease t;
@@ -344,7 +344,7 @@ namespace mongo {
             if ( !e.embeddedObject().getBoolField( "empty" ) ) {
                 if ( name != "local" ) {
                     if ( only.empty() || only == name ) {
-                        resyncDrop( name );
+                        resyncDrop( txn, name );
                     }
                 }
             }
@@ -354,16 +354,16 @@ namespace mongo {
         save();
     }
 
-    void ReplSource::resyncDrop( const string& db ) {
+    void ReplSource::resyncDrop( TransactionExperiment* txn, const string& db ) {
         log() << "resync: dropping database " << db;
         Client::Context ctx(db);
-        dropDatabase(ctx.db());
+        dropDatabase(txn, ctx.db());
     }
 
     /* grab initial copy of a database from the master */
     void ReplSource::resync(TransactionExperiment* txn, const std::string& dbName) {
         const std::string db(dbName);   // need local copy of the name, we're dropping the original
-        resyncDrop( db );
+        resyncDrop( txn, db );
         Client::Context ctx( db );
         {
             log() << "resync: cloning database " << db << " to get an initial copy" << endl;
@@ -382,7 +382,7 @@ namespace mongo {
 
             if ( !ok ) {
                 if ( errCode == DatabaseDifferCaseCode ) {
-                    resyncDrop( db );
+                    resyncDrop( txn,  db );
                     log() << "resync: database " << db << " not valid on the master due to a name conflict, dropping." << endl;
                     return;
                 }
@@ -419,7 +419,10 @@ namespace mongo {
         }
     }
 
-    bool ReplSource::handleDuplicateDbName( const BSONObj &op, const char *ns, const char *db ) {
+    bool ReplSource::handleDuplicateDbName( TransactionExperiment* txn,
+                                            const BSONObj &op,
+                                            const char* ns,
+                                            const char* db ) {
         if (dbHolder()._isLoaded(ns, storageGlobalParams.dbpath)) {
             // Database is already present.
             return true;   
@@ -492,7 +495,7 @@ namespace mongo {
             incompleteCloneDbs.erase(*i);
             addDbNextPass.erase(*i);
             Client::Context ctx(*i);
-            dropDatabase(ctx.db());
+            dropDatabase(txn, ctx.db());
         }
 
         massert( 14034, "Duplicate database names present after attempting to delete duplicates",
@@ -594,19 +597,19 @@ namespace mongo {
         }
 
         scoped_ptr<Lock::GlobalWrite> lk( alreadyLocked ? 0 : new Lock::GlobalWrite() );
+        DurTransaction txn; // XXX?
 
         if ( replAllDead ) {
             // hmmm why is this check here and not at top of this function? does it get set between top and here?
             log() << "replAllDead, throwing SyncException: " << replAllDead << endl;
             throw SyncException();
         }
 
-        if ( !handleDuplicateDbName( op, ns, clientName ) ) {
+        if ( !handleDuplicateDbName( &txn, op, ns, clientName ) ) {
             return;   
         }
 
         Client::Context ctx( ns );
-        DurTransaction txn;
         ctx.getClient()->curop()->reset();
 
         bool empty = ctx.db()->isEmpty();
@@ -1086,9 +1089,10 @@ namespace mongo {
             int s = 0;
             {
                 Lock::GlobalWrite lk;
+                DurTransaction txn;
                 if ( replAllDead ) {
                     // throttledForceResyncDead can throw
-                    if ( !replSettings.autoresync || !ReplSource::throttledForceResyncDead( "auto" ) ) {
+                    if ( !replSettings.autoresync || !ReplSource::throttledForceResyncDead( &txn, "auto" ) ) {
                         log() << "all sources dead: " << replAllDead << ", sleeping for 5 seconds" << endl;
                         break;
                     }

diff --git a/src/mongo/db/repl/master_slave.h b/src/mongo/db/repl/master_slave.h
@@ -100,7 +100,7 @@ namespace mongo {
 
         ReplSource();
 
-        void resyncDrop( const string& db );
+        void resyncDrop( TransactionExperiment* txn, const string& db );
         // call without the db mutex
         void syncToTailOfRemoteLog();
         string ns() const { return string( "local.oplog.$" ) + sourceName(); }
@@ -112,7 +112,10 @@ namespace mongo {
          * master.
          * @return true iff an op with the specified ns may be applied.
          */
-        bool handleDuplicateDbName( const BSONObj &op, const char *ns, const char *db );
+        bool handleDuplicateDbName( TransactionExperiment* txn,
+                                    const BSONObj &op,
+                                    const char* ns,
+                                    const char* db );
 
         // populates _me so that it can be passed to oplogreader for handshakes
         void ensureMe();
@@ -157,9 +160,9 @@ namespace mongo {
             return wait > 0 ? wait : 0;
         }
 
-        static bool throttledForceResyncDead( const char *requester );
-        static void forceResyncDead( const char *requester );
-        void forceResync( const char *requester );
+        static bool throttledForceResyncDead( TransactionExperiment* txn, const char *requester );
+        static void forceResyncDead( TransactionExperiment* txn, const char *requester );
+        void forceResync( TransactionExperiment* txn, const char *requester );
     };
 
     /**

diff --git a/src/mongo/db/repl/resync.cpp b/src/mongo/db/repl/resync.cpp
@@ -30,6 +30,7 @@
 #include "mongo/db/repl/master_slave.h"  // replSettings
 #include "mongo/db/repl/repl_settings.h"  // replSettings
 #include "mongo/db/repl/rs.h" // replLocalAuth()
+#include "mongo/db/storage/mmap_v1/dur_transaction.h"
 
 namespace mongo {
 
@@ -66,6 +67,7 @@ namespace mongo {
             const std::string ns = parseNs(dbname, cmdObj);
             Lock::GlobalWrite globalWriteLock;
             Client::Context ctx(ns);
+            DurTransaction txn;
 
             if (replSettings.usingReplSets()) {
                 if (theReplSet->isPrimary()) {
@@ -88,7 +90,7 @@ namespace mongo {
             if ( !waitForSyncToFinish( errmsg ) )
                 return false;
 
-            ReplSource::forceResyncDead( "client" );
+            ReplSource::forceResyncDead( &txn, "client" );
             result.append( "info", "triggered resync for all sources" );
             return true;
         }