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.

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

osd/ECBackend: inject sleep during deep scrub #20531

Merged
merged 3 commits into from Mar 1, 2018

Conversation

xiexingguo
Copy link
Member

Signed-off-by: xie xingguo xie.xingguo@zte.com.cn

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
See 588f064.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
@@ -2356,6 +2356,10 @@ int ECBackend::be_deep_scrub(

utime_t sleeptime;
sleeptime.set_from_double(cct->_conf->osd_debug_deep_scrub_sleep);
if (sleeptime != utime_t()) {
lgeneric_derr(cct) << __func__ << " sleeping for " << sleeptime << dendl;
sleeptime.sleep();
Copy link
Member

Choose a reason for hiding this comment

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

this isn't a new problem, but it makes me notice that these sleeps need fixing - since scrub is being called from the op queue threads, sleeping like this blocks one of them.

They should be converted to async sleeps like in PG::scrub().

Copy link
Member

Choose a reason for hiding this comment

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

nevermind, this is just a debug sleep

@tchaikov tchaikov merged commit 8157dbb into ceph:master Mar 1, 2018
@xiexingguo
Copy link
Member Author

Thanks @tchaikov !

@xiexingguo xiexingguo deleted the wip-ec-scrub-sleep branch March 1, 2018 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants