SERVER-13645 cleanup heartbeat_info

Author: milkie

src/mongo/db/repl/heartbeat.cpp

@@ -54,8 +54,6 @@ namespace mongo {
     MONGO_FP_DECLARE(rsDelayHeartbeatResponse);
     MONGO_FP_DECLARE(rsStopHeartbeatRequest);
 
-    unsigned int HeartbeatInfo::numPings;
-
     /* { replSetHeartbeat : <setname> } */
     class CmdReplSetHeartbeat : public ReplSetCommand {
     public:

src/mongo/db/repl/heartbeat_info.cpp

@@ -34,11 +34,36 @@
 
 namespace mongo {
 
-    long long HeartbeatInfo::timeDown() const {
-        if( up() ) return 0;
-        if( downSince == 0 )
-            return 0; // still waiting on first heartbeat
-        return jsTime() - downSince;
+    unsigned int HeartbeatInfo::numPings;
+
+    HeartbeatInfo::HeartbeatInfo() : 
+        hbstate(MemberState::RS_UNKNOWN), 
+        health(-1.0), 
+        upSince(0),
+        downSince(0), 
+        lastHeartbeat(0),
+        lastHeartbeatRecv(0),
+        skew(INT_MIN), 
+        authIssue(false), 
+        ping(0), 
+        _id(0xffffffff) { 
+    }
+
+    HeartbeatInfo::HeartbeatInfo(unsigned id) :
+        hbstate(MemberState::RS_UNKNOWN),
+        health(-1.0),
+        upSince(0),
+        downSince(0),
+        lastHeartbeat(0),
+        lastHeartbeatRecv(0),
+        skew(INT_MIN),
+        authIssue(false),
+        ping(0),
+        _id(id) {
+    }
+
+    bool HeartbeatInfo::changed(const HeartbeatInfo& old) const {
+        return health != old.health || hbstate != old.hbstate;
     }
 
     void HeartbeatInfo::updateFromLastPoll(const HeartbeatInfo& newInfo) {

src/mongo/db/repl/heartbeat_info.h

@@ -39,10 +39,8 @@ namespace mongo {
     /* this is supposed to be just basic information on a member,
        and copy constructable. */
     class HeartbeatInfo {
-        unsigned _id;
     public:
-        HeartbeatInfo() : _id(0xffffffff), hbstate(MemberState::RS_UNKNOWN), health(-1.0),
-            downSince(0), lastHeartbeatRecv(0), skew(INT_MIN), authIssue(false), ping(0) { }
+        HeartbeatInfo();
         HeartbeatInfo(unsigned id);
         unsigned id() const { return _id; }
         MemberState hbstate;
@@ -71,8 +69,6 @@ namespace mongo {
          */
         bool maybeUp() const { return health != 0; }
 
-        long long timeDown() const; // ms
-
         /* true if changed in a way of interest to the repl set manager. */
         bool changed(const HeartbeatInfo& old) const;
 
@@ -81,22 +77,8 @@ namespace mongo {
          * the last replSetHeartbeat.
          */
         void updateFromLastPoll(const HeartbeatInfo& newInfo);
+    private:
+        unsigned _id;
     };
 
-    inline HeartbeatInfo::HeartbeatInfo(unsigned id) :
-        _id(id),
-        lastHeartbeatRecv(0),
-        authIssue(false),
-        ping(0) {
-        hbstate = MemberState::RS_UNKNOWN;
-        health = -1.0;
-        downSince = 0;
-        lastHeartbeat = upSince = 0;
-        skew = INT_MIN;
-    }
-
-    inline bool HeartbeatInfo::changed(const HeartbeatInfo& old) const {
-        return health != old.health || hbstate != old.hbstate;
-    }
-
 } // namespace mongo

src/mongo/db/repl/manager.h

@@ -28,10 +28,11 @@
 
 #pragma once
 
-#include "mongo/db/repl/member.h"
+#include "mongo/db/jsobj.h"
 #include "mongo/db/repl/server.h"
 
 namespace mongo {
+    class Member;
     class ReplSetImpl;
 
     class Manager : public task::Server {

src/mongo/db/repl/repl_set_impl.h

@@ -28,18 +28,22 @@
 
 #pragma once
 
+#include "mongo/db/repl/heartbeat_info.h"
+#include "mongo/db/repl/member.h"
 #include "mongo/db/repl/rs_base.h"
-#include "mongo/db/repl/repl_set_health_poll_task.h"
+#include "mongo/db/repl/rs_config.h"
 #include "mongo/db/repl/state_box.h"
 #include "mongo/db/repl/sync_source_feedback.h"
 #include "mongo/db/repl/sync_tail.h"
 #include "mongo/util/concurrency/thread_pool.h"
+#include "mongo/util/concurrency/value.h"
 
 namespace mongo {
 
     class Cloner;
     struct FixUpInfo;
     class ReplSetCmdline;
+    class ReplSetHealthPollTask;
 
     class ReplicationStartSynchronizer {
     public:

src/mongo/db/repl/rs.h

@@ -35,9 +35,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/repl/consensus.h"
-#include "mongo/db/repl/heartbeat_info.h"
 #include "mongo/db/repl/manager.h"
-#include "mongo/db/repl/member.h"
 #include "mongo/db/repl/oplogreader.h"
 #include "mongo/db/repl/repl_set.h"
 #include "mongo/db/repl/repl_set_impl.h"

src/mongo/db/repl/server.h

@@ -64,7 +64,7 @@ namespace mongo {
             virtual bool initClient() { return true; }
             virtual string name() const { return _name; }
             void doWork();
-            deque<lam> d;
+            std::deque<lam> d;
             mongo::mutex m;
             boost::condition c;
             string _name;

src/mongo/db/repl/state_box.h

@@ -29,6 +29,7 @@
 #pragma once
 
 #include "mongo/db/repl/health.h"
+#include "mongo/db/repl/member_state.h"
 #include "mongo/util/concurrency/rwlock.h"
 
 namespace mongo {

src/mongo/shell/dbshell.cpp

@@ -40,7 +40,6 @@
 #include "mongo/client/clientOnly-private.h"
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/client/sasl_client_authenticate.h"
-#include "mongo/db/repl/heartbeat_info.h"
 #include "mongo/logger/console_appender.h"
 #include "mongo/logger/logger.h"
 #include "mongo/logger/message_event_utf8_encoder.h"