]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: do not participate in the election unless we are in electing state
authorSage Weil <sage@newdream.net>
Tue, 8 Nov 2011 20:52:51 +0000 (12:52 -0800)
committerSage Weil <sage@newdream.net>
Tue, 8 Nov 2011 20:52:51 +0000 (12:52 -0800)
If we participate, we may be included in the quorum, even tho we are
probing, slurping, whatever.

Signed-off-by: Sage Weil <sage@newdream.net>
src/mon/Monitor.cc

index 8cf92beca60bef2877539a2409463d32790f77e8..def5fd080b151c4459f366fec55c9136201c054a 100644 (file)
@@ -1210,7 +1210,10 @@ bool Monitor::_ms_dispatch(Message *m)
        dout(0) << "MMonElection received from entity without enough caps!"
                << s->caps << dendl;
       }
-      elector.dispatch(m);
+      if (!is_probing() && !is_slurping())
+       elector.dispatch(m);
+      else
+       m->put();
       break;
 
     case MSG_FORWARD: