osd/PG: two cleanups #17171
Merged
osd/PG: two cleanups #17171
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
|
@jdurgin Since you are there, mind taking a look? |
tchaikov
reviewed
Aug 23, 2017
src/osd/PG.cc
Outdated
| @@ -1168,7 +1168,8 @@ void PG::calc_ec_acting( | |||
| if (acting.size() > (unsigned)i && acting[i] != CRUSH_ITEM_NONE && | |||
| !all_info.find(pg_shard_t(acting[i], shard_id_t(i)))->second.is_incomplete() && | |||
| all_info.find(pg_shard_t(acting[i], shard_id_t(i)))->second.last_update >= | |||
| auth_log_shard->second.log_tail) { | |||
| auth_log_shard->second.log_tail && | |||
| std::find(want.begin(), want.end(), acting[i]) == want.end()) { | |||
There was a problem hiding this comment.
there is chance that two shards are co-located in the same OSD. so i don't think we should dedup here.
There was a problem hiding this comment.
Thanks for pointing out this for me, kefu. I confess that I don't understand the behaviour of EC-PGs well:-(
src/osd/PG.cc
Outdated
| @@ -1177,6 +1178,10 @@ void PG::calc_ec_acting( | |||
| j != all_info_by_shard[shard_id_t(i)].end(); | |||
| ++j) { | |||
| assert(j->shard == i); | |||
| if (j->osd == CRUSH_ITEM_NONE || | |||
There was a problem hiding this comment.
it's fine if j->osd == CRUSH_ITEM_NONE.
| @@ -1302,12 +1302,12 @@ void PG::calc_replicated_acting( | |||
| const pg_info_t &cur_info = all_info.find(acting_cand)->second; | |||
| if (cur_info.is_incomplete() || | |||
| cur_info.last_update < primary->second.log_tail) { | |||
| ss << " shard " << acting_cand << " (stray) REJECTED " | |||
| ss << " shard " << acting_cand << " (acting) REJECTED " | |||
xiexingguo
force-pushed
the
wip-dedup-ec-want-acting
branch
from
966f462
to
bc3e6e2
Compare
xiexingguo
changed the title
which has no consumers. Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
tchaikov
approved these changes
Aug 23, 2017
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.
"all_info" includes peers from up and acting sets too, thus
deduplication is still needed here when calculating want_acting set.