SERVER-13645 move Consensus class into its own header and cpp file

4 files changed, 86 insertions, 46 deletions

diff --git a/src/mongo/db/repl/consensus.cpp b/src/mongo/db/repl/consensus.cpp
index fc89d906a9d..1d1c9185445 100644
--- a/src/mongo/db/repl/consensus.cpp
+++ b/src/mongo/db/repl/consensus.cpp
@@ -30,7 +30,7 @@
 
 #include "mongo/db/commands.h"
 #include "mongo/db/repl/multicmd.h"
-#include "mongo/db/repl/rs.h"
+#include "mongo/db/repl/consensus.h"
 
 namespace mongo {
 
diff --git a/src/mongo/db/repl/consensus.h b/src/mongo/db/repl/consensus.h
new file mode 100644
index 00000000000..1d7b2cfdda6
--- /dev/null
+++ b/src/mongo/db/repl/consensus.h
@@ -0,0 +1,82 @@
+/**
+*    Copyright (C) 2008 10gen Inc.
+*
+*    This program is free software: you can redistribute it and/or  modify
+*    it under the terms of the GNU Affero General Public License, version 3,
+*    as published by the Free Software Foundation.
+*
+*    This program is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU Affero General Public License for more details.
+*
+*    You should have received a copy of the GNU Affero General Public License
+*    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*    As a special exception, the copyright holders give permission to link the
+*    code of portions of this program with the OpenSSL library under certain
+*    conditions as described in each individual source file and distribute
+*    linked combinations including the program with the OpenSSL library. You
+*    must comply with the GNU Affero General Public License in all respects for
+*    all of the code used other than as permitted herein. If you modify file(s)
+*    with this exception, you may extend this exception to your version of the
+*    file(s), but you are not obligated to do so. If you do not wish to do so,
+*    delete this exception statement from your version. If you delete this
+*    exception statement from all source files in the program, then also delete
+*    it in the license file.
+*/
+
+#pragma once
+
+#include "mongo/util/concurrency/value.h"
+
+namespace mongo {
+
+    class ReplSetImpl;
+    struct Target;
+
+    class Consensus {
+    private:
+        ReplSetImpl &rs;
+        struct LastYea {
+            LastYea() : when(0), who(0xffffffff) { }
+            time_t when;
+            unsigned who;
+        };
+        static SimpleMutex lyMutex;
+        Guarded<LastYea,lyMutex> ly;
+        unsigned yea(unsigned memberId); // throws VoteException
+        void electionFailed(unsigned meid);
+        void _electSelf();
+        bool weAreFreshest(bool& allUp, int& nTies);
+        bool sleptLast; // slept last elect() pass
+
+        // This is a unique id that is changed each time we transition to PRIMARY, as the
+        // result of an election.
+        OID _electionId;
+        // PRIMARY server's time when the election to primary occurred
+        OpTime _electionTime;
+    public:
+        Consensus(ReplSetImpl *t) : rs(*t) {
+            sleptLast = false;
+            steppedDown = 0;
+        }
+
+        /* if we've stepped down, this is when we are allowed to try to elect ourself again.
+           todo: handle possible weirdnesses at clock skews etc.
+        */
+        time_t steppedDown;
+
+        int totalVotes() const;
+        bool aMajoritySeemsToBeUp() const;
+        bool shouldRelinquish() const;
+        void electSelf();
+        void electCmdReceived(BSONObj, BSONObjBuilder*);
+        void multiCommand(BSONObj cmd, list<Target>& L);
+
+        OID getElectionId() const { return _electionId; }
+        void setElectionId(OID oid) { _electionId = oid; }
+        OpTime getElectionTime() const { return _electionTime; }
+        void setElectionTime(OpTime electionTime) { _electionTime = electionTime; }
+    };
+} // namespace mongo
diff --git a/src/mongo/db/repl/heartbeat_info.h b/src/mongo/db/repl/heartbeat_info.h
index a83d9eedbeb..1d7a4b2b945 100644
--- a/src/mongo/db/repl/heartbeat_info.h
+++ b/src/mongo/db/repl/heartbeat_info.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <climits>
+
 #include "mongo/bson/optime.h"
 #include "mongo/db/repl/rs_member.h"
 
diff --git a/src/mongo/db/repl/rs.h b/src/mongo/db/repl/rs.h
index 54db8b93a8d..c139b8c4e5f 100644
--- a/src/mongo/db/repl/rs.h
+++ b/src/mongo/db/repl/rs.h
@@ -34,6 +34,7 @@
 #include "mongo/bson/optime.h"
 #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/oplogreader.h"
 #include "mongo/db/repl/rs_config.h"
@@ -178,51 +179,6 @@ namespace mongo {
         void clearCache();
     };
 
-    class Consensus {
-    private:
-        ReplSetImpl &rs;
-        struct LastYea {
-            LastYea() : when(0), who(0xffffffff) { }
-            time_t when;
-            unsigned who;
-        };
-        static SimpleMutex lyMutex;
-        Guarded<LastYea,lyMutex> ly;
-        unsigned yea(unsigned memberId); // throws VoteException
-        void electionFailed(unsigned meid);
-        void _electSelf();
-        bool weAreFreshest(bool& allUp, int& nTies);
-        bool sleptLast; // slept last elect() pass
-
-        // This is a unique id that is changed each time we transition to PRIMARY, as the
-        // result of an election.
-        OID _electionId;
-        // PRIMARY server's time when the election to primary occurred
-        OpTime _electionTime;
-    public:
-        Consensus(ReplSetImpl *t) : rs(*t) {
-            sleptLast = false;
-            steppedDown = 0;
-        }
-
-        /* if we've stepped down, this is when we are allowed to try to elect ourself again.
-           todo: handle possible weirdnesses at clock skews etc.
-        */
-        time_t steppedDown;
-
-        int totalVotes() const;
-        bool aMajoritySeemsToBeUp() const;
-        bool shouldRelinquish() const;
-        void electSelf();
-        void electCmdReceived(BSONObj, BSONObjBuilder*);
-        void multiCommand(BSONObj cmd, list<Target>& L);
-
-        OID getElectionId() const { return _electionId; }
-        void setElectionId(OID oid) { _electionId = oid; }
-        OpTime getElectionTime() const { return _electionTime; }
-        void setElectionTime(OpTime electionTime) { _electionTime = electionTime; }
-    };
-
     /**
      * most operations on a ReplSet object should be done while locked. that
      * logic implemented here.