TempDisableDurability now does SyncAndTruncate

pdex · Jan 10, 2011 · a593ed7 · a593ed7
1 parent 3625433
commit a593ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/db/dur.cpp b/db/dur.cpp
@@ -593,12 +593,17 @@ namespace mongo {
             if (_wasDur) {
                 DurableInterface::disableDurability();
                 cmdLine.dur = false;
+
+                //SyncAndTruncate;
+                MongoFile::flushAll(true);
+                journalCleanup();
             }
         }
 
         TempDisableDurability::~TempDisableDurability() {
             dbMutex.assertWriteLocked();
             if (_wasDur) {
+                assert(!haveJournalFiles());
                 cmdLine.dur = true;
                 DurableInterface::enableDurability();
             }

diff --git a/db/dur.h b/db/dur.h
@@ -19,7 +19,7 @@ namespace mongo {
 
         class TempDisableDurability : boost::noncopyable {
         public:
-            TempDisableDurability();  // disables durability iff it is enabled
+            TempDisableDurability();  // disables durability and SyncAndTruncate iff it is enabled
             ~TempDisableDurability(); // enables durability iff constructor disabled it
         private:
             const bool _wasDur;