osd: change op delayed state to 'waiting for scrub' #19295
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
|
@liewegas need a review, please |
liewegas
requested changes
Dec 4, 2017
src/osd/PrimaryLogPG.h
Outdated
| while (op_iter != p.second.end()) { | ||
| (*op_iter)->mark_delayed("waiting for scrub"); | ||
| ++op_iter; | ||
| } |
There was a problem hiding this comment.
How about
for (auto op : p.second) {
op->mark_delayed("waiting for scrub");
}
?
otherwise, lgtm!
|
@liewegas code changed, thank you! |
liewegas
approved these changes
Dec 5, 2017
|
Jenkins retest this please |
tchaikov
reviewed
Dec 6, 2017
src/osd/PrimaryLogPG.h
Outdated
| @@ -840,6 +840,10 @@ class PrimaryLogPG : public PG, public PGBackend::Listener { | |||
| // requeue at front of scrub blocking queue if we are blocked by scrub | |||
| for (auto &&p: to_req) { | |||
| if (scrubber.write_blocked_by_scrub(p.first.get_head())) { | |||
| for (auto op : p.second) { | |||
There was a problem hiding this comment.
might want to use auto& to avoid the intrusive_ptr_add_ref and intrusive_ptr_release calls.
when release rwlock, the ops waiting for rwlock are thansfered to waiting_for_scrub if the object was blocked by scrub, the delayed state should be changed at the same time. Signed-off-by: kungf <yang.wang@easystack.cn>
tchaikov
approved these changes
Dec 6, 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.
when release rwlock, the ops waiting for rwlock are thansfered to
waiting_for_scrub if the object was blocked by scrub, the delayed
state should be changed at the same time.
Signed-off-by: kungf yang.wang@easystack.cn