SERVER-16615: Fix mmapv1 repairDatabase for long db paths

xiangya123 · Dec 29, 2014 · d9ac3cf · d9ac3cf
1 parent 6bc9cbc
commit d9ac3cf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/jstests/disk/repair2.js b/jstests/disk/repair2.js
@@ -4,7 +4,9 @@ var baseName = "jstests_disk_repair2";
 
 port = allocatePorts( 1 )[ 0 ];
 dbpath = MongoRunner.dataPath + baseName + "/";
-repairpath = dbpath + "repairDir/"
+repairpath = dbpath + "repairDir/";
+longDBName = Array(61).join('a');
+longRepairPath = dbpath + Array(61).join('b') + '/';
 
 resetDbpath( dbpath );
 resetDbpath( repairpath );
@@ -16,7 +18,8 @@ assert.commandWorked( db.runCommand( {repairDatabase:1, backupOriginalFiles:true
 function check() {
     files = listFiles( dbpath );
     for( f in files ) {
-        assert( ! new RegExp( "^" + dbpath + "backup_" ).test( files[ f ].name ), "backup dir in dbpath" );
+        assert( ! new RegExp( "^" + dbpath + "backup_" ).test( files[ f ].name ),
+                "backup dir " + files[ f ].name + " in dbpath" );
     }
 
     assert.eq.automsg( "1", "db[ baseName ].count()" );
@@ -31,6 +34,30 @@ assert.commandWorked( db.runCommand( {repairDatabase:1} ) );
 check();
 stopMongod( port );
 
+//Test long database names
+resetDbpath( repairpath );
+m = startMongoProgram( "mongod", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
+db = m.getDB( longDBName );
+assert.writeOK(db[ baseName ].save( {} ));
+assert.commandWorked( db.runCommand( {repairDatabase:1} ) );
+stopMongod( port );
+
+//Test long repairPath
+resetDbpath( longRepairPath )
+m = startMongoProgram( "mongod", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--repairpath", longRepairPath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
+db = m.getDB( longDBName );
+assert.commandWorked( db.runCommand( {repairDatabase:1, backupOriginalFiles: true} ) );
+check();
+stopMongod( port );
+
+//Test database name and repairPath with --repair
+resetDbpath( longRepairPath )
+m = startMongoProgram( "mongod", "--repair", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--repairpath", longRepairPath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
+m = startMongoProgram( "mongod", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
+db = m.getDB( longDBName );
+check();
+stopMongod( port );
+
 resetDbpath( repairpath );
 runMongoProgram( "mongod", "--repair", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--repairpath", repairpath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );
 m = startMongoProgram( "mongod", "--directoryperdb", "--port", port, "--dbpath", dbpath, "--repairpath", repairpath, "--nohttpinterface", "--bind_ip", "127.0.0.1" );

diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.cpp b/src/mongo/db/storage/mmap_v1/dur_recover.cpp
@@ -186,8 +186,7 @@ namespace mongo {
 
                     case JEntry::OpCode_DbContext: {
                         _lastDbName = (const char*) _entries->pos();
-                        const unsigned limit = std::min((unsigned)Namespace::MaxNsLenWithNUL,
-                                                        _entries->remaining());
+                        const unsigned limit = _entries->remaining();
                         const unsigned len = strnlen(_lastDbName, limit);
                         if (_lastDbName[len] != '\0') {
                             log() << "problem processing journal file during recovery";
@@ -290,7 +289,6 @@ namespace mongo {
             //TODO(mathias): look into making some of these dasserts
             verify(entry.e);
             verify(entry.dbName);
-            verify(strnlen(entry.dbName, MaxDatabaseNameLen) < MaxDatabaseNameLen);
 
             DurableMappedFile *mmf = last.newEntry(entry, *this);
 
@@ -340,7 +338,6 @@ namespace mongo {
 
         DurableMappedFile* RecoveryJob::getDurableMappedFile(const ParsedJournalEntry& entry) {
             verify(entry.dbName);
-            verify(strnlen(entry.dbName, MaxDatabaseNameLen) < MaxDatabaseNameLen);
 
             const string fn = fileName(entry.dbName, entry.e->getFileNo());
             MongoFile* file;