From: Sage Weil <sage@redhat.com>
Date: Tue, 7 May 2019 16:05:30 +0000 (-0500)
Subject: mon/OSDMonitor: require nautilus to set pg_autoscale_mode
X-Git-Tag: v14.2.3~26^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2caca5dca4b6e1a38fc54c8ac4ec545097f0fed;p=ceph.git

mon/OSDMonitor: require nautilus to set pg_autoscale_mode

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d2c591a142479cf5dd58da599da8d7212f5c5701)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f9cb049f495..05a8c5b1cc3 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7346,6 +7346,10 @@ 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) {
+      ss << "must set require_osd_release to nautilus or later before setting pg_autoscale_mode";
+      return -EINVAL;
+    }
     p.pg_autoscale_mode = n;
   } else if (var == "crush_rule") {
     int id = osdmap.crush->get_rule_id(val);