RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

crush: display item name in CrushWrapper::dump_rule()

Browse Source 
When an item name is available used it instead of displaying the number.

Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2014-02-09 21:40:08 +01:00
parent e5b6eb45ba
commit a7e9a7b648
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/crush/CrushWrapper.cc
View File

@ -1200,7 +1200,14 @@ void CrushWrapper::dump_rule(int ruleset, Formatter *f) const
break; break;
case CRUSH_RULE_TAKE: case CRUSH_RULE_TAKE:
f->dump_string("op", "take"); f->dump_string("op", "take");
f->dump_int("item", get_rule_arg1(ruleset, j)); {
int item = get_rule_arg1(ruleset, j);
const char *name = get_item_name(item);
if (name == NULL)
f->dump_int("item", item);
else
f->dump_string("item", name);
}
break; break;
case CRUSH_RULE_EMIT: case CRUSH_RULE_EMIT:
f->dump_string("op", "emit"); f->dump_string("op", "emit");

2
src/test/crush/TestCrushWrapper.cc
View File

@ -533,6 +533,8 @@ TEST(CrushWrapper, dump_rules) {
f->flush(ss); f->flush(ss);
delete f; delete f;
EXPECT_EQ(0, ss.str().find("<rule><rule_id>0</rule_id><rule_name>NAME</rule_name>")); EXPECT_EQ(0, ss.str().find("<rule><rule_id>0</rule_id><rule_name>NAME</rule_name>"));
EXPECT_NE(string::npos,
ss.str().find("<step><op>take</op><item>default</item></step>"));
} }
delete c; delete c;