update ceph source to reef 18.2.1

[ceph.git] / ceph / src / mds / FSMap.h

diff --git a/ceph/src/mds/FSMap.h b/ceph/src/mds/FSMap.h
index 5bf2f6b267f1d2ab75c5aa2c478f4fc1a4013461..f57a4177aa04f7a0fd3c78a1bb4dda3dd536dca9 100644 (file)
--- a/ceph/src/mds/FSMap.h
+++ b/ceph/src/mds/FSMap.h
@@ -205,8 +205,16 @@ public:
   void print(std::ostream& out) const;
 
   bool is_upgradeable() const {
-    return (mds_map.allows_standby_replay() && mds_map.get_num_in_mds() == 0)
-       || (!mds_map.allows_standby_replay() && mds_map.get_num_in_mds() <= 1);
+    bool asr = mds_map.allows_standby_replay();
+    auto in_mds = mds_map.get_num_in_mds();
+    auto up_mds = mds_map.get_num_up_mds();
+    return
+              /* fs was "down" */
+              (in_mds == 0)
+              /* max_mds was set to 1; asr must be disabled */
+           || (!asr && in_mds == 1)
+              /* max_mds any value and all MDS were failed; asr must be disabled */
+           || (!asr && up_mds == 0);
   }
 
   /**