mon: fix a few nits #12670
Merged
mon: fix a few nits #12670
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
requested changes
Dec 27, 2016
| @@ -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) { | |||
There was a problem hiding this comment.
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); | |||
There was a problem hiding this comment.
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" || | |||
There was a problem hiding this comment.
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.
|
updated! |
tchaikov
approved these changes
Dec 27, 2016
tchaikov
requested changes
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); | |||
There was a problem hiding this comment.
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
The convention is to use - for command names and _ for variable names. Signed-off-by: Sage Weil <sage@redhat.com>
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>
Signed-off-by: Sage Weil <sage@redhat.com>
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>
|
fixed in the rest test too
|
tchaikov
approved these changes
Dec 27, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.