dur once prealloc is used keep using it

mongodb · Feb 6, 2011 · 221dddb · 221dddb
1 parent 71ef504
commit 221dddb
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/db/dur_journal.cpp b/db/dur_journal.cpp
@@ -47,7 +47,7 @@ namespace mongo {
         BOOST_STATIC_ASSERT( sizeof(JEntry) == 12 );
         BOOST_STATIC_ASSERT( sizeof(LSNFile) == 88 );
 
-        bool _preallocateIsFaster = false;
+        bool usingPreallocate = false;
 
         void removeOldJournalFile(path p);
 
@@ -248,20 +248,21 @@ namespace mongo {
         }
 
         void preallocateFiles() {
-            _preallocateIsFaster = preallocateIsFaster();
-            if( !_preallocateIsFaster )
-                return;
-
-            try {
-                _preallocateFiles();
-            }
-            catch(...) { 
-                log() << "warning caught exception in preallocateFiles, continuing" << endl;
+            if( preallocateIsFaster() ||
+                exists(getJournalDir()/"prealloc.0") || // if enabled previously, keep using
+                exists(getJournalDir()/"prealloc.1") ) {
+                    usingPreallocate = true;
+                    try {
+                        _preallocateFiles();
+                    }
+                    catch(...) { 
+                        log() << "warning caught exception in preallocateFiles, continuing" << endl;
+                    }
             }
         }
 
         void removeOldJournalFile(path p) { 
-            if( _preallocateIsFaster ) {
+            if( usingPreallocate ) {
                 try {
                     for( int i = 0; i <= 2; i++ ) {
                         string fn = str::stream() << "prealloc." << i;