From dc09905f1e95201ba8257b70c60c9985eee6ffdb Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Tue, 16 Nov 2021 18:41:08 +0000 Subject: [PATCH] mon: dump range blocklist when dumping regular blocklist Signed-off-by: Greg Farnum --- src/mon/OSDMonitor.cc | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 39f8ba3d2e030..cd3e900c3025a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -6042,7 +6042,31 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) f->close_section(); f->flush(rdata); } - ss << "listed " << osdmap.blocklist.size() << " entries"; + if (f) + f->open_array_section("range_blocklist"); + + for (auto p = osdmap.range_blocklist.begin(); + p != osdmap.range_blocklist.end(); + ++p) { + if (f) { + f->open_object_section("entry"); + f->dump_string("range", p->first.get_legacy_str()); + f->dump_stream("until") << p->second; + f->close_section(); + } else { + stringstream ss; + string s; + ss << p->first << " " << p->second; + getline(ss, s); + s += "\n"; + rdata.append(s); + } + } + if (f) { + f->close_section(); + f->flush(rdata); + } + ss << "listed " << osdmap.blocklist.size() + osdmap.range_blocklist.size() << " entries"; } else if (prefix == "osd pool ls") { string detail; -- 2.39.5