osd: Fixes for osd_scrub_during_recovery handling #17039
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 |
There was a problem hiding this comment.
The OSD changes look good to me, but I noticed that comment doesn't make sense in skimming the test.
Also just realized that this config option clearly also blocks manually-scheduled scrubs; that should perhaps go on the list of things to improve about it in future. (Not now, though!)
| run_osd $dir $osd || return 1 | ||
| done | ||
|
|
||
| # Create a pool with a single pg |
There was a problem hiding this comment.
Sure looks to me like this is creating a pool with 32 PGs?
tchaikov
reviewed
Aug 21, 2017
| @@ -453,7 +453,7 @@ EOF | |||
| err_strings[22]="log_channel[(]cluster[)] log [[]ERR[]] : [0-9]*[.]0 scrub 22 errors" | |||
| err_strings[23]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj15:head can't decode 'snapset' attr buffer" | |||
|
|
|||
| for i in `seq 0 ${#err_strings[@]}` | |||
| for i in `seq 0 $(expr ${#err_strings[@]} - 1)` | |||
There was a problem hiding this comment.
nit, could also put:
for err_string in "${err_strings[@]}"
do
if ! grep "$err_string" $dir/osd.0.log > /dev/null;
then
echo "Missing log message '$err_string'"
ERRORS=$(expr $ERRORS + 1)
fi
done
|
@tchaikov I made the change that you recommended in 2 places. Just need to squash. |
Signed-off-by: David Zafman <dzafman@redhat.com>
Fixes: http://tracker.ceph.com/issues/18206 Signed-off-by: David Zafman <dzafman@redhat.com>
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/18206