From: Gregory Farnum <greg@gregs42.com>
Date: Wed, 10 Jun 2015 14:15:38 +0000 (-0700)
Subject: Merge pull request #4825 from tchaikov/wip-drop-ignored-mdsbeacon
X-Git-Tag: v9.0.2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b408f009b6f5be10d7afc8167277b08c89fbe283;p=ceph.git

Merge pull request #4825 from tchaikov/wip-drop-ignored-mdsbeacon

mon: drop ignored mdsbeacon

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
---

b408f009b6f5be10d7afc8167277b08c89fbe283
diff --cc src/mon/MDSMonitor.cc
index a07e567970ec,89157c0168f0..41b8ef226d90
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@@ -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 ||