From 661891aa28ca0600a62e25f6d10ce7fa94e32cce Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 9 Mar 2016 13:25:55 -0500 Subject: [PATCH] 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 --- qa/workunits/cephtool/test.sh | 2 +- src/mon/MonCommands.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index af579080012..5b29789b136 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1587,7 +1587,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 a1287dfafce..a01b32c10b2 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -705,28 +705,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", \ -- 2.39.5