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

mongodb · Aug 9, 2010 · dc1796d · dc1796d
2 parents a4dc528 + 45f777c
commit dc1796d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 5 deletions.
diff --git a/db/repl/consensus.cpp b/db/repl/consensus.cpp
@@ -83,6 +83,17 @@ namespace mongo {
         return vUp * 2 > totalVotes();
     }
 
+    bool Consensus::shouldRelinquish() const {
+        int vUp = rs._self->config().votes;
+        const long long T = rs.config().ho.heartbeatTimeoutMillis * rs.config().ho.heartbeatConnRetries;
+        for( Member *m = rs.head(); m; m=m->next() ) {
+            long long dt = m->hbinfo().timeDown();
+            if( dt < T )
+                vUp += m->config().votes;
+        }
+        return !( vUp * 2 > totalVotes() );
+    }
+
     static const int VETO = -10000;
 
     const time_t LeaseTime = 30;

diff --git a/db/repl/health.h b/db/repl/health.h
@@ -27,7 +27,7 @@ namespace mongo {
         HealthOptions() { 
             heartbeatSleepMillis = 2000;
             heartbeatTimeoutMillis = 10000;
-            heartbeatConnRetries  = 3;
+            heartbeatConnRetries  = 2;
         }
 
         bool isDefault() const { return *this == HealthOptions(); }

diff --git a/db/repl/heartbeat.cpp b/db/repl/heartbeat.cpp
@@ -40,6 +40,13 @@ namespace mongo {
     // hacky
     string *discoveredSeed = 0;
 
+    long long HeartbeatInfo::timeDown() const {
+        if( up() ) return 0;
+        if( downSince == 0 ) 
+            return 0; // still waiting on first heartbeat
+        return jsTime() - downSince;
+    }
+
     /* { replSetHeartbeat : <setname> } */
     class CmdReplSetHeartbeat : public ReplSetCommand {
     public:
@@ -205,8 +212,9 @@ namespace mongo {
     private:
         void down(HeartbeatInfo& mem, string msg) {
             mem.health = 0.0;
-            if( mem.upSince ) {
+            if( mem.upSince || mem.downSince == 0 ) {
                 mem.upSince = 0;
+                mem.downSince = jsTime();
                 log() << "replSet info " << h.toString() << " is now down (or slow to respond)" << rsLog;
             }
             mem.lastHeartbeatMsg = msg;

diff --git a/db/repl/manager.cpp b/db/repl/manager.cpp
@@ -136,7 +136,7 @@ namespace mongo {
                     return;
                 }
 
-                if( !rs->elect.aMajoritySeemsToBeUp() ) { 
+                if( rs->elect.shouldRelinquish() ) { 
                     log() << "replSet can't see a majority of the set, relinquishing primary" << rsLog;
                     rs->relinquish();
                 }

diff --git a/db/repl/rs.h b/db/repl/rs.h
@@ -102,6 +102,7 @@ namespace mongo {
 
         int totalVotes() const;
         bool aMajoritySeemsToBeUp() const;
+        bool shouldRelinquish() const;
         void electSelf();
         void electCmdReceived(BSONObj, BSONObjBuilder*);
         void multiCommand(BSONObj cmd, list<Target>& L);

diff --git a/db/repl/rs_member.h b/db/repl/rs_member.h
@@ -61,25 +61,29 @@ namespace mongo {
     class HeartbeatInfo { 
         unsigned _id;
     public:
-        HeartbeatInfo() : _id(0xffffffff),hbstate(MemberState::RS_UNKNOWN),health(-1.0),skew(INT_MIN) { }
+        HeartbeatInfo() : _id(0xffffffff),hbstate(MemberState::RS_UNKNOWN),health(-1.0),downSince(0),skew(INT_MIN) { }
         HeartbeatInfo(unsigned id);
         bool up() const { return health > 0; }
         unsigned id() const { return _id; }
         MemberState hbstate;
         double health;
         time_t upSince;
+        long long downSince;
         time_t lastHeartbeat;
         string lastHeartbeatMsg;
         OpTime opTime;
         int skew;
 
+        long long timeDown() const; // ms
+
         /* true if changed in a way of interest to the repl set manager. */
         bool changed(const HeartbeatInfo& old) const;
     };
 
     inline HeartbeatInfo::HeartbeatInfo(unsigned id) : _id(id) { 
         hbstate = MemberState::RS_UNKNOWN;
         health = -1.0;
+        downSince = 0;
         lastHeartbeat = upSince = 0; 
         skew = INT_MIN;
     }

diff --git a/db/repl/rs_sync.cpp b/db/repl/rs_sync.cpp
@@ -275,7 +275,7 @@ namespace mongo {
             r.tailCheck();
             if( !r.haveCursor() ) {
                 log() << "replSet TEMP end syncTail pass with " << hn << rsLog;
-                // TODO : reuse our cnonection to the primary.
+                // TODO : reuse our connection to the primary.
                 return;
             }
             if( box.getPrimary() != primary )