mon: remove range=100 from reweight-by-* commands

Specifying the range makes it skip instead of error when you give
it a bad value.

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index a508e0f3077d5135a8362ae876c2f14bc84841d3..f00cfa644d5e3c64d85b355de6f2981f91be721a 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1398,7 +1398,7 @@ function test_mon_osd_misc()
   ceph pg set_full_ratio 95 2>$TMPFILE; check_response 'not in range' $? 22
 
   # expect "not in range" for invalid overload percentage
-  ceph osd reweight-by-utilization 80 2>$TMPFILE; check_response 'not in range' $? 22
+  ceph osd reweight-by-utilization 80 2>$TMPFILE; check_response 'higher than 100' $? 22
 
   set -e
 

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 46fbe6d82da90df32fbfb1951213b54265e84f1c..a66cc5578403014774eff122ad635c77a0dfb67e 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -658,28 +658,28 @@ COMMAND("osd utilization",
        "get basic pg distribution stats",
        "osd", "r", "cli,rest")
 COMMAND("osd reweight-by-utilization " \
-       "name=oload,type=CephInt,range=100,req=false " \
+       "name=oload,type=CephInt,req=false " \
        "name=max_change,type=CephFloat,req=false "                     \
        "name=max_osds,type=CephInt,req=false "                 \
        "name=no_increasing,type=CephChoices,strings=--no-increasing,req=false",\
        "reweight OSDs by utilization [overload-percentage-for-consideration, default 120]", \
        "osd", "rw", "cli,rest")
 COMMAND("osd test-reweight-by-utilization " \
-       "name=oload,type=CephInt,range=100,req=false " \
+       "name=oload,type=CephInt,req=false " \
        "name=max_change,type=CephFloat,req=false "                     \
        "name=max_osds,type=CephInt,req=false "                 \
        "name=no_increasing,type=CephChoices,strings=--no-increasing,req=false",\
        "dry run of reweight OSDs by utilization [overload-percentage-for-consideration, default 120]", \
        "osd", "rw", "cli,rest")
 COMMAND("osd reweight-by-pg " \
-       "name=oload,type=CephInt,range=100,req=false " \
+       "name=oload,type=CephInt,req=false " \
        "name=max_change,type=CephFloat,req=false "                     \
        "name=max_osds,type=CephInt,req=false "                 \
        "name=pools,type=CephPoolname,n=N,req=false",                   \
        "reweight OSDs by PG distribution [overload-percentage-for-consideration, default 120]", \
        "osd", "rw", "cli,rest")
 COMMAND("osd test-reweight-by-pg " \
-       "name=oload,type=CephInt,range=100,req=false " \
+       "name=oload,type=CephInt,req=false " \
        "name=max_change,type=CephFloat,req=false "                     \
        "name=max_osds,type=CephInt,req=false "                 \
        "name=pools,type=CephPoolname,n=N,req=false",                   \