mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:mongodb/mongo

Browse Source
This commit is contained in:
Eliot Horowitz 2010-08-03 09:47:18 -04:00
commit c01bef0ef1
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/db.cpp
View File

@ -919,6 +919,13 @@ int main(int argc, char* argv[], char *envp[] )
cmdLine.pretouch = params["pretouch"].as<int>();
}
if (params.count("replSet")) {
if (params.count("slavedelay")) {
cout << "--slavedelay cannot be used with --replSet" << endl;
::exit(-1);
} else if (params.count("only")) {
cout << "--only cannot be used with --replSet" << endl;
::exit(-1);
}
/* seed list of hosts for the repl set */
cmdLine._replSet = params["replSet"].as<string>().c_str();
}

1
jstests/replsets/rollback.js
View File

@ -1,3 +1,4 @@
print("TODO FINISH THIS TEST NOT DONE");
var debugging = 0;

2
jstests/replsets/sync1.js
View File

@ -187,6 +187,6 @@ doTest = function (signal) {
replTest.stopSet(signal);
}
if( 0 || debugging ) {
if( 1 || debugging ) {
doTest( 15 );
}

2
s/config.cpp
View File

@ -466,7 +466,7 @@ namespace mongo {
}
conn.done();
}
catch ( std::exception& e ){
catch ( std::exception& ){
log(LL_WARNING) << " couldn't check on config server:" << _config[i] << " ok for now" << endl;
}
res.push_back(x);