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

mongodb · Aug 3, 2010 · c01bef0 · c01bef0
2 parents 7207fe3 + 10ddb86
commit c01bef0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/db/db.cpp b/db/db.cpp
@@ -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();
         }

diff --git a/jstests/replsets/rollback.js b/jstests/replsets/rollback.js
@@ -1,3 +1,4 @@
+print("TODO FINISH THIS TEST NOT DONE");
 
 var debugging = 0;
 

diff --git a/jstests/replsets/sync1.js b/jstests/replsets/sync1.js
@@ -187,6 +187,6 @@ doTest = function (signal) {
     replTest.stopSet(signal);
 }
 
-if( 0 || debugging ) {
+if( 1 || debugging ) {
     doTest( 15 );
 }
diff --git a/s/config.cpp b/s/config.cpp
@@ -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);