osd/OSDMap: more pg upmap fixes #21670
Merged
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
|
retest this please |
hjwsm1989
reviewed
Apr 26, 2018
| map<int, float> weight_map; | ||
| auto it = rule_weight_map.find(crush_rule); | ||
| if (it == rule_weight_map.end()) { | ||
| auto r = tmpmap.crush->get_rule_weight_osd_map(crush_rule, &weight_map); |
There was a problem hiding this comment.
this way is simple to find whether osd is in bucket
hjwsm1989
reviewed
Apr 26, 2018
src/osd/OSDMap.cc
Outdated
| << "pg_upmap_items entry " | ||
| << "[" << osdmap.pg_upmap.find(pg)->first << ":" | ||
| << osdmap.pg_upmap.find(pg)->second << "]" | ||
| << dendl; |
There was a problem hiding this comment.
should be osdmap.pg_upmap_items.find(pg)
There was a problem hiding this comment.
@hjwsm1989 Thank you very much. Fixed!
added 4 commits
April 27, 2018 09:16
There is too much code redundancy.. Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
Fixes: http://tracker.ceph.com/issues/23878 Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
pg_upmap/pg_upmap_items should not bring osds which no longer belong to a specific crush-tree in. Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
liewegas
approved these changes
Apr 27, 2018
liewegas
added
needs-qa
wip-sage-testing
wip-sage2-testing
and removed
wip-sage-testing
labels
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.
Fixes: http://tracker.ceph.com/issues/23878