Skip to content

test/osd-scrub-dump.sh: fix scrub chunk size#50236

Merged
ronen-fr merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-total-dump
Feb 26, 2023
Merged

test/osd-scrub-dump.sh: fix scrub chunk size#50236
ronen-fr merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-total-dump

Conversation

@ronen-fr
Copy link
Contributor

@ronen-fr ronen-fr commented Feb 23, 2023

The test performs shallow scrubs, intentionally using small chunk sizes to allow dump commands time to check specific details. Following commit ffda641 (PR#44749), shallow scrubs chunks are controlled by a separate configuration parameter. This PR fixes the test to use the correct parameter.

An additional minor change is an adjustment to the test loop sleep time:
See https://gist.github.com/ronen-fr/e1aaf304ffff7a7c71073b09fde2197e for a sample pre-change run presenting
the timing of replica & local reservations vs the test samples. Note the initial delay in the test sampling.

Fixes: https://tracker.ceph.com/issues/58797

@ronen-fr ronen-fr requested a review from a team as a code owner February 23, 2023 16:17
@github-actions github-actions bot added the core label Feb 23, 2023
@ronen-fr ronen-fr added the tests label Feb 23, 2023
@ljflores
Copy link
Member

jenkins test api

@ljflores
Copy link
Member

jenkins test make check

Copy link
Contributor

@athanatos athanatos left a comment

Choose a reason for hiding this comment

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

LGTM other than the sleep change -- not sure what the intention is there.

fi
total=$(expr $total + $pass)
sleep $(expr $SCRUB_SLEEP \* 2)
sleep $(expr $SCRUB_SLEEP \* 2 - 2)
Copy link
Contributor

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've accidentally removed the relevant part in the commit message. The sleeps, esp. the first one, were too long
(as evident from the gist linked in the PR message).
I'll restore the explanation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

... and simplify the code

@ronen-fr ronen-fr force-pushed the wip-rf-total-dump branch 2 times, most recently from c189f9e to cc7fede Compare February 26, 2023 09:59
The test performs shallow scrubs, intentionally using small chunk
sizes to allow dump commands time to check specific details.
Following commit ffda641
(PR#44749), shallow scrubs chunks are controlled by a separate
configuration parameter. This PR fixes the test to use the
correct parameter.

An additional minor change is an adjustment to the test loop sleep time:
it is now reduced to guarantee that a dump followed by a counter
increase will be performed in more-or-less the scrubs frequency.

Fixes: https://tracker.ceph.com/issues/58797
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
@ronen-fr
Copy link
Contributor Author

jenkins test make check

@ronen-fr ronen-fr merged commit dac0fce into ceph:main Feb 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants