diff options
Diffstat (limited to 'jstests')
| -rw-r--r-- | jstests/disk/directoryperdb.js | 157 | ||||
| -rw-r--r-- | jstests/disk/repair2.js | 32 |
2 files changed, 148 insertions, 41 deletions
diff --git a/jstests/disk/directoryperdb.js b/jstests/disk/directoryperdb.js index dc21860caba..157efbd07b6 100644 --- a/jstests/disk/directoryperdb.js +++ b/jstests/disk/directoryperdb.js @@ -3,46 +3,137 @@ var baseName = "directoryperdb" port = allocatePorts( 1 )[ 0 ]; dbpath = MongoRunner.dataPath + baseDir + "/"; -var m = startMongodTest(port, baseDir, false, {directoryperdb : "", nohttpinterface : "", bind_ip : "127.0.0.1"}); -db = m.getDB( baseName ); -db[ baseName ].save( {} ); -assert.eq( 1, db[ baseName ].count() , "A : " + tojson( db[baseName].find().toArray() ) ); -checkDir = function( dir ) { - db.adminCommand( {fsync:1} ); +var storageEngine = db.serverStatus().storageEngine.name; + +// The pattern which matches the names of database files +var dbFileMatcher; +if ( storageEngine == "mmapv1" ) { + // Matches mmapv1 *.ns and *.0, *.1, etc files. + dbFileMatcher = /\.(ns|\d+)$/; +} else if ( storageEngine == "wiredTiger" ) { + // Matches wiredTiger collection-*.wt and index-*.wt files + dbFileMatcher = /(collection|index)-.+\.wt$/; +} else { + assert( false, "This test must be run against mmapv1 or wiredTiger" ); +} + +// Set up helper functions. +assertDocumentCount = function(db, count) { + assert.eq( count, db[ baseName ].count() , + "Expected " + count + " documents in " + db._name + "." + baseName + ". " + + "Found: " + tojson( db[ baseName ].find().toArray() ) ); +} + + +checkDBFilesInDBDirectory = function( db ) { + db.adminCommand( { fsync : 1 } ); + + var dir = dbpath + db._name; files = listFiles( dir ); - found = false; + var fileCount = 0; for( f in files ) { - if ( new RegExp( baseName ).test( files[ f ].name ) ) { - found = true; - assert( files[ f ].isDirectory, "file not directory" ); + if ( files[ f ].isDirectory ) + continue; + fileCount += 1; + assert( dbFileMatcher.test( files[ f ].name ), + "In directory:" + dir + " found unexpected file: " + files[ f ].name ); + } + assert( fileCount > 0, "Expected more than zero nondirectory files in database directory" ); +} + +checkDBDirectoryNonexistent = function( db ) { + db.adminCommand( { fsync : 1 } ); + + var files = listFiles( dbpath ); + // Check that there are no files in the toplevel dbpath. + for ( f in files ) { + if ( !files[ f ].isDirectory ) { + assert( !dbFileMatcher.test( files[ f ].name ), + "Database file" + files[ f ].name + + " exists in dbpath after deleting all non-directoryperdb databases"); } } - assert( found, "no directory" ); - files = listFiles( dir + baseName ); - for( f in files ) { - if ( files[f].isDirectory ) - continue; - assert( new RegExp( baseName + "/" + baseName + "." ).test( files[ f ].name ) , "B dir:" + dir + " f: " + f ); + // Check db directories to ensure db files in them have been destroyed. + // mmapv1 removes the database directory, pending SERVER-1379. + if ( storageEngine == "mmapv1" ) { + var files = listFiles( dbpath ); + var fileNotFound = true; + for ( f in files ) { + assert( files[ f ].name != db._name, + "Directory " + db._name + " still exists" ); + } + } else if ( storageEngine == "wiredTiger" ) { + var files = listFiles( dbpath + db._name ) + assert.eq( files.length, 0, + "Files left behind in database directory" ); } } -checkDir( dbpath ); - -// file iterator -assert( m.getDBs().totalSize > 0, "bad size calc" ); - -// repair -db.runCommand( {repairDatabase:1, backupOriginalFiles:true} ); -checkDir( dbpath ); -// data directory is always cleared by startMongodTest() -var backupDir = dbpath + "/backup_repairDatabase_0/"; -checkDir( backupDir ); -assert.eq( 1, db[ baseName ].count() , "C" ); - -// drop db test -db.dropDatabase(); -files = listFiles( dbpath ); -files.forEach( function( f ) { assert( !new RegExp( baseName ).test( f.name ), "drop database - dir not cleared" ); } ); + +// Start the directoryperdb instance of mongod. +var m = MongoRunner.runMongod( { storageEngine : storageEngine, dbpath : dbpath, + directoryperdb : "" } ); +// Check that the 'local' db has allocated data. +var localDb = m.getDB( "local" ); +checkDBFilesInDBDirectory( localDb ); + +// Create database with directoryperdb. +var dbBase = m.getDB( baseName ); +dbBase[ baseName ].insert( {} ); +assertDocumentCount( dbBase, 1 ); +checkDBFilesInDBDirectory( dbBase ); + +// Drop a database created with directoryperdb. +assert.commandWorked( dbBase.runCommand( { dropDatabase : 1 } ) ); +assertDocumentCount( dbBase, 0 ); +checkDBDirectoryNonexistent( dbBase ); + +// It should be impossible to create a database named "journal" with directoryperdb, as that +// directory exists. This test has been disabled until SERVER-2460 is resolved. +/* +db = m.getDB( "journal" ); +assert.writeError(db[ "journal" ].insert( {} )); +*/ + +// Using WiredTiger, it should be impossible to create a database named "WiredTiger" with +// directoryperdb, as that file is created by the WiredTiger storageEngine. +if ( storageEngine == "wiredTiger" ) { + var dbW = m.getDB( "WiredTiger" ); + assert.writeError( dbW[ baseName ].insert( {} ) ); +} + +// Create a database named 'a' repeated 63 times. +var dbNameAA = Array( 64 ).join( 'a' ); +var dbAA = m.getDB( dbNameAA ); +assert.writeOK( dbAA[ baseName ].insert( {} ) ); +assertDocumentCount( dbAA, 1 ); +checkDBFilesInDBDirectory( dbAA ); + +// Create a database named '&'. +var dbAnd = m.getDB( '&' ); +assert.writeOK( dbAnd[ baseName ].insert( {} ) ); +assertDocumentCount( dbAnd, 1 ); +checkDBFilesInDBDirectory( dbAnd ); + + +// Unicode directoryperdb databases do not work on Windows. +// Disabled until https://jira.mongodb.org/browse/SERVER-16725 +// is resolved. +if ( !_isWindows() ) { + // Create a database named '処'. + var dbNameU = '処'; + var dbU = m.getDB( dbNameU ); + assert.writeOK( dbU[ baseName ].insert( {} ) ); + assertDocumentCount( dbU, 1 ); + checkDBFilesInDBDirectory( dbU ); + + // Create a database named '処' repeated 21 times. + var dbNameUU = Array(22).join('処'); + var dbUU = m.getDB( dbNameUU ); + assert.writeOK( dbUU[ baseName ].insert( {} ) ); + assertDocumentCount( dbUU, 1 ); + checkDBFilesInDBDirectory( dbUU ); +} print("SUCCESS directoryperdb.js"); diff --git a/jstests/disk/repair2.js b/jstests/disk/repair2.js index b97087bd9c6..f794653d144 100644 --- a/jstests/disk/repair2.js +++ b/jstests/disk/repair2.js @@ -2,6 +2,16 @@ var baseName = "jstests_disk_repair2"; +function check() { + files = listFiles( dbpath ); + for( f in files ) { + assert( ! new RegExp( "^" + dbpath + "backup_" ).test( files[ f ].name ), + "backup dir " + files[ f ].name + " in dbpath" ); + } + + assert.eq.automsg( "1", "db[ baseName ].count()" ); +} + port = allocatePorts( 1 )[ 0 ]; dbpath = MongoRunner.dataPath + baseName + "/"; repairpath = dbpath + "repairDir/"; @@ -15,15 +25,21 @@ m = startMongoProgram( "mongod", "--directoryperdb", "--port", port, "--dbpath", db = m.getDB( baseName ); db[ baseName ].save( {} ); 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 " + files[ f ].name + " in dbpath" ); - } - - assert.eq.automsg( "1", "db[ baseName ].count()" ); + +//Check that repair files exist in the repair directory, and nothing else +db.adminCommand( { fsync : 1 } ); +files = listFiles( repairpath + "/backup_repairDatabase_0/" + baseName ); +var fileCount = 0; +for( f in files ) { + print( files[ f ].name ); + if ( files[ f ].isDirectory ) + continue; + fileCount += 1; + assert( /\.bak$/.test( files[ f ].name ), + "In database repair directory, found unexpected file: " + files[ f ].name ); } +assert( fileCount > 0, "Expected more than zero nondirectory files in the database directory" ); + check(); stopMongod( port ); |