rs fix

mongodb · Jul 30, 2010 · 4c7452e · 4c7452e
1 parent e8cbbe6
commit 4c7452e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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/shell/mongo_vstudio.cpp b/shell/mongo_vstudio.cpp
@@ -990,7 +990,7 @@ const char * jsconcatcode =
  "return this._name;}\n"
  "DB.prototype.toString = function(){\n"
  "return this._name;}\n"
- "DB.prototype.isMaster = function(){ return db.runCommand(\"isMaster\");}\n"
+ "DB.prototype.isMaster = function(){ return this.runCommand(\"isMaster\");}\n"
  "DB.prototype.currentOp = function(){\n"
  "return db.$cmd.sys.inprog.findOne();}\n"
  "DB.prototype.currentOP = DB.prototype.currentOp;\n"