get rid of TempDisableDurability and replace with syncDataAndTruncateJournal

1 files changed, 5 insertions, 18 deletions

diff --git a/db/dur.cpp b/db/dur.cpp
index 50d3c8ae093..05401225e7f 100644
--- a/db/dur.cpp
+++ b/db/dur.cpp
@@ -588,27 +588,14 @@ namespace mongo {
             boost::thread t(durThread);
         }
 
-        TempDisableDurability::TempDisableDurability() : _wasDur(cmdLine.dur), _lock(durThreadMutex) {
+        void DurableImpl::syncDataAndTruncateJournal() {
             dbMutex.assertWriteLocked();
-            if (_wasDur) {
-                groupCommit();
-
-                DurableInterface::disableDurability();
-                cmdLine.dur = false;
 
-                //SyncAndTruncate;
-                MongoFile::flushAll(true);
-                journalCleanup();
-            }
-        }
+            groupCommit();
+            MongoFile::flushAll(true);
+            journalCleanup();
 
-        TempDisableDurability::~TempDisableDurability() {
-            dbMutex.assertWriteLocked();
-            if (_wasDur) {
-                assert(!haveJournalFiles());
-                cmdLine.dur = true;
-                DurableInterface::enableDurability();
-            }
+            assert(!haveJournalFiles()); // Double check post-conditions
         }
 
     } // namespace dur