From 76bd2b46454ff6a9261ef3d02ce63d0b1ae8714c Mon Sep 17 00:00:00 2001
From: dwight <dwight@dwights-MacBook-Pro.local>
Date: Sun, 1 Aug 2010 11:42:16 -0400
Subject: [PATCH] rs better diags

---
 db/repl/health.cpp         | 13 ++++++++-----
 db/repl/rs_initialsync.cpp |  4 ++++
 db/repl/rs_rollback.cpp    |  8 ++++++--
 db/repl/rs_sync.cpp        | 11 +++++++----
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/db/repl/health.cpp b/db/repl/health.cpp
index e517ff0a900..2a45571f968 100644
--- a/db/repl/health.cpp
+++ b/db/repl/health.cpp
@@ -139,10 +139,11 @@ namespace mongo {
         be e = op["ts"];
         if( e.type() == Date || e.type() == Timestamp ) { 
             OpTime ot = e._opTime();
-            ss << td( a("",ot.toString(),ot.toStringPretty()) );
+	    ss << td( time_t_to_String_short( ot.getSecs() ) );
+            ss << td( ot.toString() );
             skip.insert("ts");
         }
-        else ss << td("?");
+        else ss << td("?") << td("?");
 
         e = op["h"];
         if( e.type() == NumberLong ) {
@@ -183,7 +184,7 @@ namespace mongo {
         ScopedConn conn(m->fullName());        
 
         auto_ptr<DBClientCursor> c = conn->query(rsoplog, Query().sort("$natural",1), 20, 0, &fields);
-        static const char *h[] = {"ts","h","op","ns","rest",0};
+        static const char *h[] = {"ts","optime", "h","op","ns","rest",0};
 
         ss << "<style type=\"text/css\" media=\"screen\">"
             "table { font-size:75% }\n"
@@ -229,6 +230,8 @@ namespace mongo {
             }
         }
         ss << _table();
+        ss << p(time_t_to_String_short(time(0)) + " current time");
+
         //ss << "</pre>\n";
 
         if( !otEnd.isNull() ) {
@@ -242,7 +245,7 @@ namespace mongo {
                 ss << h / 24.0 << " days";
             ss << "</p>\n";
         }
-        ss << p("Current time: " + time_t_to_String_short(time(0)));
+
     }
 
     void ReplSetImpl::_summarizeAsHtml(stringstream& s) const { 
@@ -257,7 +260,7 @@ namespace mongo {
             "<a title=\"length of time we have been continuously connected to the other member with no reconnects (for self, shows uptime)\">cctime</a>", 
             "<a title=\"when this server last received a heartbeat response - includes error code responses\">Last heartbeat</a>", 
             "Votes", "State", "Status", 
-            "<a title=\"how up to date this server is; write operations are sequentially numbered.  this value polled every few seconds so actually lag is typically much lower than value shown here.\">opord</a>", 
+            "<a title=\"how up to date this server is.  this value polled every few seconds so actually lag is typically much lower than value shown here.\">optime</a>", 
             "<a title=\"Clock skew in seconds relative to this server. Informational; server clock variances will make the diagnostics hard to read, but otherwise are benign..\">skew</a>", 
             0};
         s << table(h);
diff --git a/db/repl/rs_initialsync.cpp b/db/repl/rs_initialsync.cpp
index c7078344c25..4a3622f0c5d 100644
--- a/db/repl/rs_initialsync.cpp
+++ b/db/repl/rs_initialsync.cpp
@@ -137,6 +137,10 @@ namespace mongo {
             writelock lk("local.");
             Client::Context cx( "local." );
             cx.db()->flushFiles(true);            
+	    try {
+	      log() << "replSet set minValid=" << minValid["ts"]._opTime().toString() << rsLog;
+	    }
+	    catch(...){}
             Helpers::putSingleton("local.replset.minvalid", minValid);
             // write an op from the primary to our oplog that existed when 
             // we started cloning.  that will be our starting point.
diff --git a/db/repl/rs_rollback.cpp b/db/repl/rs_rollback.cpp
index e6fd7752240..a586871cacd 100644
--- a/db/repl/rs_rollback.cpp
+++ b/db/repl/rs_rollback.cpp
@@ -266,8 +266,12 @@ namespace mongo {
 
        dbMutex.assertWriteLocked();
 
-       /* we have items we are writing that aren't from a point-in-time.  thus best not to come online until we get to that point 
-          in freshness. */
+       /* we have items we are writing that aren't from a point-in-time.  thus best not to come online 
+	  until we get to that point in freshness. */
+       try {
+	 log() << "replSet set minvalid=" << newMinValid["ts"]._opTime().toString() << rsLog;
+       }
+       catch(...){}
        Helpers::putSingleton("local.replset.minvalid", newMinValid);
 
        Client::Context c(rsoplog, dbpath, 0, /*doauth*/false);
diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp
index 3608e992a92..0ef72dd98ab 100644
--- a/db/repl/rs_sync.cpp
+++ b/db/repl/rs_sync.cpp
@@ -140,12 +140,14 @@ namespace mongo {
                     /* perhaps we should check this earlier? but not before the rollback checks. */
                     if( state().recovering() ) { 
                         /* can we go to RS_SECONDARY state?  we can if not too old and if minvalid achieved */
-                        bool golive = false;
+                        bool golive = false;			
+			OpTime minvalid;
                         {
                             readlock lk("local.replset.minvalid");
-                            BSONObj mv;
+			    BSONObj mv;
                             if( Helpers::getSingleton("local.replset.minvalid", mv) ) { 
-                                if( mv["ts"]._opTime() <= lastOpTimeWritten ) { 
+			        minvalid = mv["ts"]._opTime();
+                                if( minvalid <= lastOpTimeWritten ) { 
                                     golive=true;
                                 }
                             }
@@ -158,7 +160,8 @@ namespace mongo {
                             changeState(MemberState::RS_SECONDARY);
                         }
                         else { 
-                            sethbmsg("still syncing, not yet to minValid optime");
+			    sethbmsg(str::stream() << "still syncing, not yet to minValid optime " << minvalid.toString());
+			    //log() << "TEMP " << lastOpTimeWritten.toString() << rsLog;
                         }
 
                         /* todo: too stale capability */