Skip to content
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.

Sign up for GitHub

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

Jump to bottom

crushtool: improve usage/tip messages #7142

Merged
merged 2 commits into from Jan 18, 2016
Merged

crushtool: improve usage/tip messages #7142

merged 2 commits into from Jan 18, 2016

Conversation

xiexingguo
Copy link
Member

So they are displayed in a more uniform style and more human-readable.

@xiexingguo
Copy link
Member Author

@dillaman Some cleanups. Could you help me review it? Thanks:-)

xiexingguo
xiexingguo reviewed Jan 8, 2016
View reviewed changes
src/tools/crushtool.cc
cout << " insert or move an item into the hierarchy at the\n";
cout << " given location\n";
cout << " -i mapfn --remove-item name\n"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dillaman Besides, some of the tips conflict with the implementation. Take "--remove-item" for example, the implementation(check line 415 below here) really considers "--remove_item" as a match, although we can rightfully handle both internally.

@xiexingguo
Copy link
Member Author

@dillaman @liewegas Revert the underscore changes and only some typos and indention fixes are kept, please review.

@liewegas
Copy link
Member

I think you ned to run test/run-cli-tests and then move the help.t.err to help.t and commit

@xiexingguo
Copy link
Member Author

Below is the test results:
[root@c8 test]# ./run-cli-tests
cli/ceph-authtool/add-key-segv.t: passed
cli/ceph-authtool/add-key.t: passed
cli/ceph-authtool/cap-bin.t: passed
cli/ceph-authtool/cap-invalid.t: passed
cli/ceph-authtool/cap-overwrite.t: passed
cli/ceph-authtool/cap.t: passed
cli/ceph-authtool/create-gen-list-bin.t: passed
cli/ceph-authtool/create-gen-list.t: passed
cli/ceph-authtool/help.t: passed
cli/ceph-authtool/list-empty-bin.t: passed
cli/ceph-authtool/list-empty.t: passed
cli/ceph-authtool/list-nonexistent-bin.t: passed
cli/ceph-authtool/list-nonexistent.t: passed
cli/ceph-authtool/manpage.t: passed
cli/ceph-authtool/simple.t: passed

Ran 15 tests, 0 skipped, 0 failed.

cli/ceph-conf/env-vs-args.t: passed
cli/ceph-conf/help.t: passed
cli/ceph-conf/invalid-args.t: passed
cli/ceph-conf/manpage.t: passed
cli/ceph-conf/option.t: passed
cli/ceph-conf/sections.t: passed
cli/ceph-conf/show-config.t: passed
cli/ceph-conf/show-config-value.t: passed
cli/ceph-conf/simple.t: passed

Ran 9 tests, 0 skipped, 0 failed.

cli/crushtool/add-item-in-tree.t: passed
cli/crushtool/add-item.t: passed
cli/crushtool/adjust-item-weight.t: passed
cli/crushtool/bad-mappings.t: passed
cli/crushtool/build.t: passed
cli/crushtool/check-names.empty.t: passed
cli/crushtool/check-names.max-id.t: passed
cli/crushtool/compile-decompile-recompile.t: passed
cli/crushtool/help.t: passed
cli/crushtool/location.t: passed
cli/crushtool/output-csv.t: passed
cli/crushtool/reweight_multiple.t: passed
cli/crushtool/reweight.t: passed
cli/crushtool/set-choose.t: passed
cli/crushtool/show-choose-tries.t: passed
cli/crushtool/straw2.t: passed
cli/crushtool/test-map-bobtail-tunables.t: passed
cli/crushtool/test-map-firefly-tunables.t: passed
cli/crushtool/test-map-firstn-indep.t: passed
cli/crushtool/test-map-indep.t: passed
cli/crushtool/test-map-legacy-tunables.t: passed
cli/crushtool/test-map-tries-vs-retries.t: passed
cli/crushtool/test-map-vary-r-0.t: passed
cli/crushtool/test-map-vary-r-1.t: passed
cli/crushtool/test-map-vary-r-2.t: passed
cli/crushtool/test-map-vary-r-3.t: passed
cli/crushtool/test-map-vary-r-4.t: passed

Ran 27 tests, 0 skipped, 0 failed.

cli/monmaptool/add-exists.t: passed
cli/monmaptool/add-many.t: passed
cli/monmaptool/clobber.t: passed
cli/monmaptool/create-print.t: passed
cli/monmaptool/create-with-add.t: passed
cli/monmaptool/help.t: passed
cli/monmaptool/print-empty.t: passed
cli/monmaptool/print-nonexistent.t: passed
cli/monmaptool/rm-nonexistent.t: passed
cli/monmaptool/rm.t: passed
cli/monmaptool/simple.t: passed

Ran 11 tests, 0 skipped, 0 failed.

cli/osdmaptool/clobber.t: passed
cli/osdmaptool/create-print.t: passed
cli/osdmaptool/create-racks.t: passed
cli/osdmaptool/crush.t: passed
cli/osdmaptool/help.t: passed
cli/osdmaptool/missing-argument.t: passed
cli/osdmaptool/pool.t: passed
cli/osdmaptool/print-empty.t: passed
cli/osdmaptool/print-nonexistent.t: passed
cli/osdmaptool/test-map-pgs.t: passed

Ran 10 tests, 0 skipped, 0 failed.

cli/radosgw-admin/help.t: passed

Ran 1 tests, 0 skipped, 0 failed.

cli/rbd/help.t: passed
cli/rbd/invalid-snap-usage.t: passed
cli/rbd/not-enough-args.t: passed

Ran 3 tests, 0 skipped, 0 failed.

@xiexingguo xiexingguo force-pushed the xxg-wip-crush branch 2 times, most recently from bb0b24a to a5483c0 Compare January 12, 2016 08:03
@xiexingguo
CrushTool: exit if fail to add a bucket
db2e21c 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
@xiexingguo
CrushTool: fix typo and improve indention
e063edd 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
liewegas added a commit that referenced this pull request Jan 18, 2016
@liewegas
Merge pull request #7142 from xiexingguo/xxg-wip-crush
f0475a3 
crushtool: improve usage/tip messages

Reviewed-by: Sage Weil <sage@redhat.com>
@liewegas liewegas merged commit f0475a3 into ceph:master Jan 18, 2016
@xiexingguo xiexingguo deleted the xxg-wip-crush branch January 19, 2016 00:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cleanup needs-qa tools wip-sage2-testing
Projects
None yet
Milestone
No milestone
3 participants
@xiexingguo @liewegas @dillaman