From: Sage Weil <sage@redhat.com>
Date: Thu, 4 May 2017 17:33:59 +0000 (-0500)
Subject: include/ceph_features: rename OSDMAP_REMAP -> OSDMAP_PG_UPMAP
X-Git-Tag: v12.0.3~50^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fccc7ac72a0ed56948a79d11ce061d003cc51bb;p=ceph.git

include/ceph_features: rename OSDMAP_REMAP -> OSDMAP_PG_UPMAP

Missed this with the remap -> upmap rename a few weeks back.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index c5578161a93c..767d5f8c1617 100755
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -98,9 +98,9 @@ DEFINE_CEPH_FEATURE_RETIRED(20, 1, MON_NULLROUTE, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE_RETIRED(21, 1, MON_GV, HAMMER, JEWEL)
 DEFINE_CEPH_FEATURE(21, 2, SERVER_LUMINOUS)
-DEFINE_CEPH_FEATURE(21, 2, RESEND_ON_SPLIT) // overlap
-DEFINE_CEPH_FEATURE(21, 2, RADOS_BACKOFF)   // overlap
-DEFINE_CEPH_FEATURE(21, 2, OSDMAP_REMAP)    // overlap
+DEFINE_CEPH_FEATURE(21, 2, RESEND_ON_SPLIT)  // overlap
+DEFINE_CEPH_FEATURE(21, 2, RADOS_BACKOFF)    // overlap
+DEFINE_CEPH_FEATURE(21, 2, OSDMAP_PG_UPMAP)  // overlap
 DEFINE_CEPH_FEATURE_RETIRED(22, 1, BACKFILL_RESERVATION, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE(23, 1, MSG_AUTH)
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 4058f7936414..cc803e8e063f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7598,7 +7598,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EPERM;
       goto reply;
     }
-    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_REMAP, ss);
+    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_PG_UPMAP, ss);
     if (err == -EAGAIN)
       goto wait;
     if (err < 0)
@@ -7660,7 +7660,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EPERM;
       goto reply;
     }
-    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_REMAP, ss);
+    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_PG_UPMAP, ss);
     if (err == -EAGAIN)
       goto wait;
     if (err < 0)
@@ -7705,7 +7705,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EPERM;
       goto reply;
     }
-    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_REMAP, ss);
+    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_PG_UPMAP, ss);
     if (err == -EAGAIN)
       goto wait;
     if (err < 0)
@@ -7780,7 +7780,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EPERM;
       goto reply;
     }
-    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_REMAP, ss);
+    err = check_cluster_features(CEPH_FEATUREMASK_OSDMAP_PG_UPMAP, ss);
     if (err == -EAGAIN)
       goto wait;
     if (err < 0)
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 8b3071beb8f4..b0b64ccaadb5 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1170,8 +1170,8 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
   mask |= CEPH_FEATURES_CRUSH;
 
   if (!pg_upmap.empty() || !pg_upmap_items.empty())
-    features |= CEPH_FEATUREMASK_OSDMAP_REMAP;
-  mask |= CEPH_FEATUREMASK_OSDMAP_REMAP;
+    features |= CEPH_FEATUREMASK_OSDMAP_PG_UPMAP;
+  mask |= CEPH_FEATUREMASK_OSDMAP_PG_UPMAP;
 
   for (auto &pool: pools) {
     if (pool.second.has_flag(pg_pool_t::FLAG_HASHPSPOOL)) {
@@ -1247,7 +1247,7 @@ pair<string,string> OSDMap::get_min_compat_client() const
 {
   uint64_t f = get_features(CEPH_ENTITY_TYPE_CLIENT, nullptr);
 
-  if (HAVE_FEATURE(f, OSDMAP_REMAP)) {         // v12.0.0-1733-g27d6f43
+  if (HAVE_FEATURE(f, OSDMAP_PG_UPMAP)) {      // v12.0.0-1733-g27d6f43
     return make_pair("luminous", "12.2.0");
   }
   if (HAVE_FEATURE(f, CRUSH_TUNABLES5)) {      // v10.0.0-612-g043a737
@@ -2145,7 +2145,7 @@ void OSDMap::encode(bufferlist& bl, uint64_t features) const
 
   {
     uint8_t v = 4;
-    if (!HAVE_FEATURE(features, OSDMAP_REMAP)) {
+    if (!HAVE_FEATURE(features, OSDMAP_PG_UPMAP)) {
       v = 3;
     }
     ENCODE_START(v, 1, bl); // client-usable data