fix invalid 'unexpected file in journal directory' error message.

180

1 files changed, 7 insertions, 6 deletions

diff --git a/db/dur_recover.cpp b/db/dur_recover.cpp
index 94aa4a1b28c..18e722f868c 100644
--- a/db/dur_recover.cpp
+++ b/db/dur_recover.cpp
@@ -73,16 +73,17 @@ namespace mongo {
                     if( m.count(u) ) {
                         uasserted(13531, str::stream() << "unexpected files in journal directory " << dir.string() << " : " << fileName);
                     }
-                    if( !m.empty() && !m.count(u-1) ) {
-                        uasserted(13532,
-                                  str::stream() << "unexpected file in journal directory " << dir.string()
-                                  << " : " << fileName << " : can't find its preceeding file");
-                    }
                     m.insert( pair<unsigned,path>(u,filepath) );
                 }
             }
-            for( map<unsigned,path>::iterator i = m.begin(); i != m.end(); ++i )
+            for( map<unsigned,path>::iterator i = m.begin(); i != m.end(); ++i ) {
+                if( i != m.begin() && m.count(i->first - 1) == 0 ) {
+                    uasserted(13532,
+                    str::stream() << "unexpected file in journal directory " << dir.string()
+                      << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
+                }
                 files.push_back(i->second);
+            }
         }
 
         /** read through the memory mapped data of a journal file (journal/j._<n> file)