update ceph source to reef 18.1.2

[ceph.git] / ceph / src / mon / mon_types.h

diff --git a/ceph/src/mon/mon_types.h b/ceph/src/mon/mon_types.h
index ec4b74897708dc450f2170d35317d48a1963edf3..02aad5a0b870b4bef7eae32563eba536c3de848e 100644 (file)
--- a/ceph/src/mon/mon_types.h
+++ b/ceph/src/mon/mon_types.h
@@ -488,6 +488,7 @@ namespace ceph {
       // elector pinging and CONNECTIVITY mode:
       constexpr mon_feature_t FEATURE_PINGING(    (1ULL << 7));
       constexpr mon_feature_t FEATURE_QUINCY(    (1ULL << 8));
+      constexpr mon_feature_t FEATURE_REEF(    (1ULL << 9));
 
       constexpr mon_feature_t FEATURE_RESERVED(   (1ULL << 63));
       constexpr mon_feature_t FEATURE_NONE(       (0ULL));
@@ -508,6 +509,7 @@ namespace ceph {
          FEATURE_PACIFIC |
          FEATURE_PINGING |
          FEATURE_QUINCY |
+         FEATURE_REEF |
          FEATURE_NONE
          );
       }
@@ -532,6 +534,7 @@ namespace ceph {
          FEATURE_PACIFIC |
          FEATURE_PINGING |
          FEATURE_QUINCY |
+         FEATURE_REEF |
          FEATURE_NONE
          );
       }
@@ -550,6 +553,9 @@ namespace ceph {
 
 static inline ceph_release_t infer_ceph_release_from_mon_features(mon_feature_t f)
 {
+  if (f.contains_all(ceph::features::mon::FEATURE_REEF)) {
+    return ceph_release_t::reef;
+  }
   if (f.contains_all(ceph::features::mon::FEATURE_QUINCY)) {
     return ceph_release_t::quincy;
   }
@@ -595,6 +601,8 @@ static inline const char *ceph::features::mon::get_feature_name(uint64_t b) {
     return "pacific";
   } else if (f == FEATURE_QUINCY) {
     return "quincy";
+  } else if (f == FEATURE_REEF) {
+    return "reef";
   } else if (f == FEATURE_RESERVED) {
     return "reserved";
   }
@@ -621,6 +629,8 @@ inline mon_feature_t ceph::features::mon::get_feature_by_name(const std::string
     return FEATURE_PACIFIC;
   } else if (n == "quincy") {
     return FEATURE_QUINCY;
+  } else if (n == "reef") {
+    return FEATURE_REEF;
   } else if (n == "reserved") {
     return FEATURE_RESERVED;
   }