From: Neha Ojha <nojha@redhat.com>
Date: Thu, 15 Aug 2019 00:21:48 +0000 (-0700)
Subject: mon/OSDMonitor.cc: use CEPH_RELEASE_LUMINOUS instead of ceph_release_t::nautilus
X-Git-Tag: v14.2.3~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29671%2Fhead;p=ceph.git

mon/OSDMonitor.cc: use CEPH_RELEASE_LUMINOUS instead of ceph_release_t::nautilus

This commit is specific to nautilus, since cherry-pick of
7e7134aa9317a0d64503edb20b9ea1f4035c7e9e and
d2c591a142479cf5dd58da599da8d7212f5c5701, did not result in conflicts.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 05a8c5b1cc3d..3f50e6fd3d26 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7274,7 +7274,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
 	return -EPERM;
       }
     }
-    if (osdmap.require_osd_release < ceph_release_t::nautilus) {
+    if (osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) {
       // pre-nautilus osdmap format; increase pg_num directly
       assert(n > (int)p.get_pg_num());
       // force pre-nautilus clients to resend their ops, since they
@@ -7334,7 +7334,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
       ss << "specified pgp_num " << n << " > pg_num " << p.get_pg_num_target();
       return -EINVAL;
     }
-    if (osdmap.require_osd_release < ceph_release_t::nautilus) {
+    if (osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) {
       // pre-nautilus osdmap format; increase pgp_num directly
       p.set_pgp_num(n);
     } else {
@@ -7346,7 +7346,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
       ss << "specified invalid mode " << val;
       return -EINVAL;
     }
-    if (osdmap.require_osd_release < ceph_release_t::nautilus) {
+    if (osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) {
       ss << "must set require_osd_release to nautilus or later before setting pg_autoscale_mode";
       return -EINVAL;
     }