New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mon: fix a few nits #12670

Merged
merged 4 commits into from Dec 29, 2016

Conversation

Projects
None yet
2 participants
@liewegas
Member

liewegas commented Dec 26, 2016

No description provided.

@@ -5315,6 +5333,16 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
}
}
p.set_pgp_num(n);
} else if (var == "crush_rule") {
int id = osdmap.crush->get_rule_id(val);
if (id < 0) {

This comment has been minimized.

@tchaikov

tchaikov Dec 27, 2016

Contributor

nit, could check it against -ENOENT explicitly.

@@ -1881,7 +1881,6 @@ void PGMap::dump_pool_stats(const OSDMap &osd_map, stringstream *ss,
tbl.define_column("NAME", TextTable::LEFT, TextTable::LEFT);
tbl.define_column("ID", TextTable::LEFT, TextTable::LEFT);
if (verbose) {
tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
tbl.define_column("QUOTA OBJECTS", TextTable::LEFT, TextTable::LEFT);

This comment has been minimized.

@tchaikov

tchaikov Dec 27, 2016

Contributor

might need to update the test of TEST_pool_quota in src/test/mon/test_pool_quota.sh, line 39 and 40, so the $3 and $4 fields are extracted instead of $4 and $5 fields,

/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/mon/test_pool_quota.sh:44: TEST_pool_quota:  '[' 0 '!=' N/A ']'
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/mon/test_pool_quota.sh:46: TEST_pool_quota:  return 1
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/mon/test_pool_quota.sh:24: run:  return 1

see https://jenkins.ceph.com/job/ceph-pull-requests/16213/consoleFull

@@ -1758,7 +1758,8 @@ int MDSMonitor::management_command(
// Persist the new FSMap
pending_fsmap.filesystems[new_fs->fscid] = new_fs;
return 0;
} else if (prefix == "fs set_default") {
} else if (prefix == "fs set_default" ||

This comment has been minimized.

@tchaikov

tchaikov Dec 27, 2016

Contributor

probably we can update test/pybind/test_ceph_argparse.py accordingly to s/set_default/set-default/ to remove another hurdle if we want to deprecate fs set_default in future.

@liewegas

This comment has been minimized.

Member

liewegas commented Dec 27, 2016

updated!

@tchaikov tchaikov added the needs-qa label Dec 27, 2016

@@ -1883,7 +1883,6 @@ void PGMap::dump_pool_stats(const OSDMap &osd_map, stringstream *ss,
tbl.define_column("NAME", TextTable::LEFT, TextTable::LEFT);
tbl.define_column("ID", TextTable::LEFT, TextTable::LEFT);
if (verbose) {
tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
tbl.define_column("QUOTA OBJECTS", TextTable::LEFT, TextTable::LEFT);

This comment has been minimized.

@tchaikov

tchaikov Dec 27, 2016

Contributor

ahh, should also remove the test in test_mon_misc() in qa/workunits/cephtool/test.sh, line 629

/home/jenkins-build/build/workspace/ceph-pull-requests/qa/workunits/cephtool/test.sh:629: test_mon_misc:  grep CATEGORY /tmp/cephtool.8LJ/test_invalid.oCp

see https://jenkins.ceph.com/job/ceph-pull-requests/16254/consoleFull

@tchaikov tchaikov removed the needs-qa label Dec 27, 2016

liewegas added some commits Dec 25, 2016

mon: 'fs set-default' not 'fs set_default'
The convention is to use - for command names and
_ for variable names.

Signed-off-by: Sage Weil <sage@redhat.com>
mon/PGMap: fix alignment of 'cache io' in ceph -s output
Currently it looks like

  client io 3508 B/s wr, 0 op/s rd, 5 op/s wr
  cache io 0 op/s promote

but should be

  client io 3508 B/s wr, 0 op/s rd, 5 op/s wr
   cache io 0 op/s promote

Signed-off-by: Sage Weil <sage@redhat.com>
mon/PGMap: remove CATEGORY column from 'df detail'
Signed-off-by: Sage Weil <sage@redhat.com>
mon/OSDMonitor: ceph osd pool get/set crush_rule by name
This means users don't have to manually translate a rule
they just created to a ruleset ID in order to map a pool
to it.

Signed-off-by: Sage Weil <sage@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Dec 27, 2016

@liewegas liewegas merged commit 13c01a0 into ceph:master Dec 29, 2016

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-nits branch Dec 29, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment