From: Sage Weil <sage@inktank.com>
Date: Mon, 2 Jul 2012 23:05:16 +0000 (-0700)
Subject: mon: initialize quorum_features
X-Git-Tag: v0.48argonaut~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1fe589209763500ee1411e0884e36cd5c584da9;p=ceph.git

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>
---

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;