summaryrefslogtreecommitdiff
path: root/src/mon
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-02 16:05:16 -0700
committerSage Weil <sage@inktank.com>2012-07-02 16:05:16 -0700
commita1fe589209763500ee1411e0884e36cd5c584da9 (patch)
tree7d4b178ba928ff157387f6a5421abe698a5cb68a /src/mon
parent2472034c4fcd53575734ac8ac8e877687c9ca910 (diff)
downloadceph-a1fe589209763500ee1411e0884e36cd5c584da9.tar.gz
mon: initialize quorum_features
This could cause us to incorrectly encode new features into the monstore that an old mon won't understand. This is overly conservative; we probably need to persist the set of quorum features that are supported and use those. Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/mon')
-rw-r--r--src/mon/Monitor.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index a75e307e823..5903ac4f52d 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -108,6 +108,7 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorStore *s, Messenger *m, Mo
elector(this),
leader(0),
+ quorum_features(0),
probe_timeout_event(NULL),
paxos(PAXOS_NUM), paxos_service(PAXOS_NUM),
@@ -974,6 +975,7 @@ void Monitor::lose_election(epoch_t epoch, set<int> &q, int l)
leader = l;
quorum = q;
outside_quorum.clear();
+ quorum_features = 0;
dout(10) << "lose_election, epoch " << epoch << " leader is mon" << leader
<< " quorum is " << quorum << dendl;