From: Sage Weil Date: Mon, 24 May 2021 19:17:58 +0000 (-0400) Subject: mgr: fix reweight-by-utilization cephbool flag X-Git-Tag: v17.1.0~1726^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c70a4f583c7bca7d240d13495b8c1571514847f2;p=ceph.git mgr: fix reweight-by-utilization cephbool flag This was broken, since it was trying to get a CephChoices as a bool. Signed-off-by: Sage Weil --- diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index ea41ba058870..479ea7a80cb0 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -1443,7 +1443,7 @@ bool DaemonServer::_handle_command( return true; } bool no_increasing = false; - cmd_getval(cmdctx->cmdmap, "no_increasing", no_increasing); + cmd_getval_compat_cephbool(cmdctx->cmdmap, "no_increasing", no_increasing); string out_str; mempool::osdmap::map new_weights; r = cluster_state.with_osdmap_and_pgmap([&](const OSDMap &osdmap, const PGMap& pgmap) { diff --git a/src/mgr/MgrCommands.h b/src/mgr/MgrCommands.h index bc3350da448e..11607446b84b 100644 --- a/src/mgr/MgrCommands.h +++ b/src/mgr/MgrCommands.h @@ -111,7 +111,7 @@ COMMAND("osd reweight-by-utilization " \ "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",\ + "name=no_increasing,type=CephBool,req=false",\ "reweight OSDs by utilization [overload-percentage-for-consideration, default 120]", \ "osd", "rw") COMMAND("osd test-reweight-by-utilization " \