Skip to content

test/scrub: only instruct clean PGs to scrub#59437

Merged
ronen-fr merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-early-command
Sep 22, 2024
Merged

test/scrub: only instruct clean PGs to scrub#59437
ronen-fr merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-early-command

Conversation

@ronen-fr
Copy link
Contributor

Recent changes to the scrub scheduling mechanism, especially regarding the 'must_scrub' flag, cause operator scrub commands issued on a not-clean PG to be rejected - and forgotten.

This commit changes the tests to issue a scrub command only after the target PG is clean.

Copy link
Member

@ljflores ljflores left a comment

Choose a reason for hiding this comment

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

Fine with me except for a small nit.

#######################################################################

##
# Predicate checking if the named PG is in state "acrive+clean"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Predicate checking if the named PG is in state "acrive+clean"
# Predicate checking if the named PG is in state "active+clean"

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'll fix that. Thanks

@ljflores
Copy link
Member

This should be run through the QA suite before merging to ensure the test is working.

@ljflores
Copy link
Member

ljflores commented Sep 3, 2024

jenkins test make check

@ronen-fr
Copy link
Contributor Author

ronen-fr commented Sep 8, 2024

The 8aa84ad version is buggy. The test for a clean PG rejects active+clean+inconsistent.
I'll fix shortly, then retest thru Teuthology.

FIXED

@ronen-fr ronen-fr added the DNM label Sep 8, 2024
@ronen-fr ronen-fr force-pushed the wip-rf-early-command branch from 8aa84ad to d9ca5c0 Compare September 8, 2024 12:26
@ronen-fr ronen-fr removed the DNM label Sep 8, 2024
@ronen-fr ronen-fr force-pushed the wip-rf-early-command branch from d9ca5c0 to 656bc1b Compare September 10, 2024 15:48
Recent changes to the scrub scheduling mechanism, especially
regarding the 'must_scrub' flag, cause operator scrub commands
issued on a not-clean PG to be rejected - and forgotten.

This commit changes the tests to issue a scrub command only
after the target PG is clean.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
@ronen-fr ronen-fr force-pushed the wip-rf-early-command branch from 656bc1b to b01c0e9 Compare September 10, 2024 15:57
@ronen-fr
Copy link
Contributor Author

Merging based on multiple Teuthology runs (I had to include the change in all other branches I tested).

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