mon: dump range blocklist when dumping regular blocklist

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit dc09905f1e95201ba8257b70c60c9985eee6ffdb)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8dba16550cf8594df566eef3ec831c3e50971e92..1d289f181148d48f89b3575badfe87e7dcd74e6a 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6060,7 +6060,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;