RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17125 from xiexingguo/wip-add-bucket-with-loc

Browse Source 
mon/OSDMonitor: add location option for "crush add-bucket" command

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Yuri Weinstein 2017-08-29 09:12:43 -07:00 committed by GitHub
commit f4c4a9d90c
4 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qa/workunits/mon/crush_ops.sh
View File

@ -92,6 +92,14 @@ ceph osd tree | grep -c host1 | grep -q 0
expect_false ceph osd crush rm bar # not empty
ceph osd crush unlink host2
ceph osd crush add-bucket host-for-test host root=root-for-test rack=rack-for-test
ceph osd tree | grep host-for-test
ceph osd tree | grep rack-for-test
ceph osd tree | grep root-for-test
ceph osd crush rm host-for-test
ceph osd crush rm rack-for-test
ceph osd crush rm root-for-test
# reference foo and bar with a rule
ceph osd crush rule create-simple foo-rule foo host firstn
expect_false ceph osd crush rm foo

6
src/mon/MonCommands.h
View File

@ -528,8 +528,10 @@ COMMAND("osd crush set name=prior_version,type=CephInt,req=false", \
"osd", "rw", "cli,rest")
COMMAND("osd crush add-bucket " \
"name=name,type=CephString,goodchars=[A-Za-z0-9-_.] " \
"name=type,type=CephString", \
"add no-parent (probably root) crush bucket <name> of type <type>", \
"name=type,type=CephString " \
"name=args,type=CephString,n=N,goodchars=[A-Za-z0-9-_.=],req=false", \
"add no-parent (probably root) crush bucket <name> of type <type> " \
"to location <args>", \
"osd", "rw", "cli,rest")
COMMAND("osd crush rename-bucket " \
"name=srcname,type=CephString,goodchars=[A-Za-z0-9-_.] " \

31
src/mon/OSDMonitor.cc
View File

@ -7631,8 +7631,16 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
} else if (prefix == "osd crush add-bucket") {
// os crush add-bucket <name> <type>
string name, typestr;
vector<string> argvec;
cmd_getval(g_ceph_context, cmdmap, "name", name);
cmd_getval(g_ceph_context, cmdmap, "type", typestr);
cmd_getval(g_ceph_context, cmdmap, "args", argvec);
map<string,string> loc;
if (!argvec.empty()) {
CrushWrapper::parse_loc_map(argvec, &loc);
dout(0) << "will create and move bucket '" << name
<< "' to location " << loc << dendl;
}
if (!_have_pending_crush() &&
_get_stable_crush().name_exists(name)) {
@ -7672,10 +7680,29 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
goto reply;
}
if (!loc.empty()) {
if (!newcrush.check_item_loc(g_ceph_context, bucketno, loc,
(int *)NULL)) {
err = newcrush.move_bucket(g_ceph_context, bucketno, loc);
if (err < 0) {
ss << "error moving bucket '" << name << "' to location " << loc;
goto reply;
}
} else {
ss << "no need to move item id " << bucketno << " name '" << name
<< "' to location " << loc << " in crush map";
}
}
pending_inc.crush.clear();
newcrush.encode(pending_inc.crush, mon->get_quorum_con_features());
ss << "added bucket " << name << " type " << typestr
<< " to crush map";
if (loc.empty()) {
ss << "added bucket " << name << " type " << typestr
<< " to crush map";
} else {
ss << "added bucket " << name << " type " << typestr
<< " to location " << loc;
}
goto update;
} else if (prefix == "osd crush rename-bucket") {
string srcname, dstname;

6
src/test/pybind/test_ceph_argparse.py
View File

@ -613,13 +613,11 @@ class TestOSD(TestArgparse):
def test_crush_add_bucket(self):
self.assert_valid_command(['osd', 'crush', 'add-bucket',
'name', 'type'])
self.assert_valid_command(['osd', 'crush', 'add-bucket',
'name', 'type', 'root=foo-root', 'host=foo-host'])
assert_equal({}, validate_command(sigdict, ['osd', 'crush']))
assert_equal({}, validate_command(sigdict, ['osd', 'crush',
'add-bucket']))
assert_equal({}, validate_command(sigdict, ['osd', 'crush',
'add-bucket', 'name',
'type',
'toomany']))
assert_equal({}, validate_command(sigdict, ['osd', 'crush',
'add-bucket', '^^^',
'type']))