Merge pull request #25686 from joscollin/wip-37737-luminous

luminous: MDSMonitor: allow beacons from stopping MDS that was laggy Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
ceph · Jan 12, 2019 · 5a9d72c · 5a9d72c
2 parents dff9a09 + 2376775
commit 5a9d72c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
@@ -700,7 +700,9 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
         });
     }
 
-    if (info.state == MDSMap::STATE_STOPPING && state != MDSMap::STATE_STOPPED ) {
+    if (info.state == MDSMap::STATE_STOPPING &&
+        state != MDSMap::STATE_STOPPING &&
+        state != MDSMap::STATE_STOPPED) {
       // we can't transition to any other states from STOPPING
       dout(0) << "got beacon for MDS in STATE_STOPPING, ignoring requested state change"
 	       << dendl;