summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-02-05 16:35:55 -0800
committerSage Weil <sage@inktank.com>2013-02-05 16:35:55 -0800
commit3b635423bda16030cfe7593ecc85edeb79736200 (patch)
tree9349e251f84ce1575c2c3337db23559dab2290aa
parent9f4d4ac9cc4db5f5186cfdfd8f3522a7f677e43e (diff)
downloadceph-3b635423bda16030cfe7593ecc85edeb79736200.tar.gz
mon: move list_rules into CrushWrapper method
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/mon/OSDMonitor.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 349773f6d27..209bb982d86 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2000,11 +2000,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
m->cmd[3] == "ls")) {
JSONFormatter jf(true);
jf.open_array_section("rules");
- for (int rule = 0; rule < osdmap.crush->get_max_rules(); rule++) {
- if (!osdmap.crush->rule_exists(rule))
- continue;
- jf.dump_string("name", osdmap.crush->get_rule_name(rule));
- }
+ osdmap.crush->list_rules(&jf);
jf.close_section();
ostringstream rs;
jf.flush(rs);