From 24698dd73297badd4188a90f92b466d61227378a Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Wed, 14 Aug 2019 17:21:48 -0700 Subject: [PATCH] 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 --- src/mon/OSDMonitor.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 05a8c5b1cc3d6..3f50e6fd3d261 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; } -- 2.39.5