]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4825 from tchaikov/wip-drop-ignored-mdsbeacon
authorGregory Farnum <greg@gregs42.com>
Wed, 10 Jun 2015 14:15:38 +0000 (07:15 -0700)
committerGregory Farnum <greg@gregs42.com>
Wed, 10 Jun 2015 14:15:38 +0000 (07:15 -0700)
mon: drop ignored mdsbeacon

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
1  2 
src/mon/MDSMonitor.cc

index a07e567970ecabc40ab02f6aef15921cb27554ca,89157c0168f061a1693ab963a7d7bd69593c53f6..41b8ef226d90ecc8ad15aeb9fb46e6e908afe7b4
@@@ -317,10 -317,10 +317,10 @@@ bool MDSMonitor::preprocess_beacon(MMDS
    }
    if (state == MDSMap::STATE_BOOT) {
      // ignore, already booted.
-     goto out;
+     goto ignore;
    }
    // is there a state change here?
 -  if (info.state != state) {    
 +  if (info.state != state) {
      // legal state change?
      if ((info.state == MDSMap::STATE_STANDBY ||
         info.state == MDSMap::STATE_STANDBY_REPLAY ||