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

tools/crushtool: skip device id if no name exists #18901

Merged
merged 1 commit into from Nov 18, 2017
Merged

tools/crushtool: skip device id if no name exists #18901

merged 1 commit into from Nov 18, 2017

Conversation

jan--f
Copy link
Contributor

@jan--f jan--f commented Nov 13, 2017 •
edited by smithfarm

When an OSD with an id < max_id is removed, i.e. the osd ids are not
continuous, crushtool decompile prints bogus info. Skip any device ids
without a name.

Fixes: http://tracker.ceph.com/issues/22117

Signed-off-by: Jan Fajerski jfajerski@suse.com

@liewegas
Copy link
Member

please run 'ctest -R cli-tests' and fix up the tests for the adjusted output. you can just copy the whatever.t.err file on top of whatever.t (in src/test/cli/crushtool) in most cases.

tools/crushtool: skip device id if no name exists
85737f9 
When an OSD with an id < max_id is removed, i.e. the osd ids are not
continuous, crushtool decompile prints bogus info. Skip any device ids
without a name.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
@jan--f jan--f force-pushed the jan-crushtool-decompile-missing-ids branch from 54414db to 85737f9 Compare November 14, 2017 11:46
@tchaikov
Copy link
Contributor

@tchaikov tchaikov merged commit e5aee68 into ceph:master Nov 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tchaikov tchaikov tchaikov approved these changes

Assignees
No one assigned
Labels
common needs-qa wip-kefu-testing
Projects
None yet
Milestone
No milestone
3 participants
@jan--f @liewegas @tchaikov