From e86360ed5e2e5cabf5b33fe47fb2a31a683b6464 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Mar 2020 21:05:21 -0500 Subject: [PATCH] mon/MgrMonitor: make 'mgr fail' work with no arguments Fail the active mgr so you don't have to check ceph -s and cut&paste it or do some jq shenanigans with 'mgr dump'. Signed-off-by: Sage Weil --- src/mon/MgrMonitor.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 397c3700c21d7..ef126edd65222 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -1051,7 +1051,13 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op) if (prefix == "mgr fail") { string who; - cmd_getval(cmdmap, "who", who); + if (!cmd_getval(cmdmap, "who", who)) { + if (!map.active_gid) { + ss << "Currently no active mgr"; + goto out; + } + who = map.active_name; + } std::string err; uint64_t gid = strict_strtol(who.c_str(), 10, &err); -- 2.39.5