mon/MDSMonitor: do not generate mdsmaps from already-laggy mds

There is one path where a mds that is not sending its beacon (e.g.,
because it is not running at all) will lead to proposal of new mdsmaps.
Fix it.

Backport: emperor, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 584c2dd6bea3fe1a3c7f306874c054ce0cf0d2b5)

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 1c34a766e5ff2811af72d468646e2829c36c46d8..baff01582c9bdf3875dee63d0d1ffcdc6cabb122 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1150,14 +1150,15 @@ void MDSMonitor::tick()
                   << " " << ceph_mds_state_name(info.state)
                   << " (laggy)" << dendl;
          pending_mdsmap.mds_info.erase(gid);
+         do_propose = true;
        } else if (!info.laggy()) {
          dout(10) << " marking " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc
                   << " " << ceph_mds_state_name(info.state)
                   << " laggy" << dendl;
          info.laggy_since = now;
+         do_propose = true;
        }
        last_beacon.erase(gid);
-       do_propose = true;
       }
     }