summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2014-05-22 17:23:58 -0400
committerEric Milkie <milkie@10gen.com>2014-05-22 17:52:02 -0400
commit3420a0121eaf0684b06a506d3758dd0d16af740f (patch)
treef44ae0409cf41e9c0fab27f41db420b5528d7783
parentcdea983b23a82419513157616ee73d8c344e0148 (diff)
downloadmongo-3420a0121eaf0684b06a506d3758dd0d16af740f.tar.gz
SERVER-13645 kill dead code
-rw-r--r--src/mongo/db/repl/rs_config.cpp5
-rw-r--r--src/mongo/db/repl/rs_config.h4
2 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/repl/rs_config.cpp b/src/mongo/db/repl/rs_config.cpp
index 0897e859136..13c0967ef74 100644
--- a/src/mongo/db/repl/rs_config.cpp
+++ b/src/mongo/db/repl/rs_config.cpp
@@ -496,7 +496,6 @@ namespace replset {
static const set<string> legals(legal, legal + 4);
assertOnlyHas(o, legals);
- md5 = o.md5();
_id = o["_id"].String();
if( o["version"].ok() ) {
version = o["version"].numberInt();
@@ -651,7 +650,6 @@ namespace replset {
}
void ReplSetConfig::init(BSONObj cfg, bool force) {
- _constructed = false;
clear();
from(cfg);
if( force ) {
@@ -661,7 +659,6 @@ namespace replset {
if( version < 1 )
version = 1;
_ok = true;
- _constructed = true;
}
ReplSetConfig* ReplSetConfig::make(const HostAndPort& h) {
@@ -685,7 +682,6 @@ namespace replset {
void ReplSetConfig::init(const HostAndPort& h) {
LOG(2) << "ReplSetConfig load " << h.toString() << rsLog;
- _constructed = false;
clear();
int level = 2;
DEV level = 0;
@@ -761,7 +757,6 @@ namespace replset {
checkRsConfig();
_ok = true;
LOG(level) << "replSet load config ok from " << (h.isSelf() ? "self" : h.toString()) << rsLog;
- _constructed = true;
}
} // namespace replset
diff --git a/src/mongo/db/repl/rs_config.h b/src/mongo/db/repl/rs_config.h
index 1dab0945f8d..83c6c47171e 100644
--- a/src/mongo/db/repl/rs_config.h
+++ b/src/mongo/db/repl/rs_config.h
@@ -157,7 +157,7 @@ namespace replset {
};
HealthOptions ho;
- std::string md5;
+
BSONObj getLastErrorDefaults;
std::map<std::string,TagRule*> rules;
@@ -196,8 +196,6 @@ namespace replset {
public:
int getMajority() const;
- bool _constructed;
-
/**
* Get the timeout to use for heartbeats.
*/