From 0580f0125bc014e5d97b8317a1bd53a3495f03bf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 17 Jan 2018 11:23:39 -0600 Subject: [PATCH] mon/OSDMonitor: squelch 'id' arg errors Several commands use 'id' but for other types (e.g., vector). Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 1d9cef39e6d..6a22f1dbf13 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7240,7 +7240,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, int64_t osdid; string name; - bool osdid_present = cmd_getval(cct, cmdmap, "id", osdid); + bool osdid_present = false; + if (prefix != "osd pg-temp" && + prefix != "osd pg-upmap" && + prefix != "osd pg-upmap-items") { // avoid commands with non-int id arg + osdid_present = cmd_getval(cct, cmdmap, "id", osdid); + } if (osdid_present) { ostringstream oss; oss << "osd." << osdid; -- 2.39.5