diff options
| -rw-r--r-- | db/dbwebserver.cpp | 2 | ||||
| -rw-r--r-- | db/repl/consensus.cpp | 2 | ||||
| -rw-r--r-- | jstests/replsets/sync1.js | 12 | ||||
| -rw-r--r-- | util/concurrency/vars.cpp | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/db/dbwebserver.cpp b/db/dbwebserver.cpp index 517af083fd2..d6fc85da72e 100644 --- a/db/dbwebserver.cpp +++ b/db/dbwebserver.cpp @@ -196,7 +196,7 @@ namespace mongo { } ss << start(dbname) << h2(dbname); ss << "<a href=\"/_commands\">List all commands</a> | \n"; - ss << "<a href=\"/_replSet\">Replica set status</a>\n"; + ss << "<a href=\"/_replSet\">Replica set status</a><br>\n"; //ss << "<a href=\"/_status\">_status</a>"; { diff --git a/db/repl/consensus.cpp b/db/repl/consensus.cpp index 6b1b1f27c9d..f67d9509a21 100644 --- a/db/repl/consensus.cpp +++ b/db/repl/consensus.cpp @@ -205,7 +205,7 @@ namespace mongo { } } DEV log() << "replSet dev we are freshest of up nodes, nok:" << nok << " nTies:" << nTies << rsLog; - assert( ord == theReplSet->lastOpTimeWritten ); + assert( ord <= theReplSet->lastOpTimeWritten ); // <= as this may change while we are working... return true; } diff --git a/jstests/replsets/sync1.js b/jstests/replsets/sync1.js index fb5dca5e5e6..2732ea39739 100644 --- a/jstests/replsets/sync1.js +++ b/jstests/replsets/sync1.js @@ -63,14 +63,16 @@ doTest = function( signal ) { max1 = dbs[1].bar.find().sort({z:-1}).limit(1).next(); max2 = dbs[2].bar.find().sort({z:-1}).limit(1).next(); - print("**********************************************"); - printjson(max1); - printjson(max2); + print("sync1.js: WAITING FOR MATCH " + Date() + " z[1]:" + max1.z + " z[2]:" + max2.z); + + // printjson(max1); + // printjson(max2); sleep(2000); count++; - if (count == 20) { + if (count == 100) { + print("replsets/sync1.js fails timing out"); assert(false); break; } @@ -83,4 +85,4 @@ doTest = function( signal ) { replTest.stopSet( signal ); } -//doTest( 15 ); +doTest( 15 ); diff --git a/util/concurrency/vars.cpp b/util/concurrency/vars.cpp index 080ab815ecf..2b46946ff85 100644 --- a/util/concurrency/vars.cpp +++ b/util/concurrency/vars.cpp @@ -35,7 +35,7 @@ namespace mongo { } void MutexDebugger::programEnding() { - if( followers.size() ) { + if( logLevel>=1 && followers.size() ) { std::cout << followers.size() << " mutexes in program" << endl; for( map< mid, set<mid> >::iterator i = followers.begin(); i != followers.end(); i++ ) { cout << i->first; |