Skip to content

standalone: osd-recovery-scrub.sh: Recovery never started#40101

Merged
tchaikov merged 2 commits intoceph:masterfrom
dzafman:wip-49779
Mar 15, 2021
Merged

standalone: osd-recovery-scrub.sh: Recovery never started#40101
tchaikov merged 2 commits intoceph:masterfrom
dzafman:wip-49779

Conversation

@dzafman
Copy link
Contributor

@dzafman dzafman commented Mar 13, 2021

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

…y state"

This reverts commit 1323bdb.

The tests needs to scrub while recovery is in progress, so catching
recovery from the logs after the fact isn't the proper setup.
We can use osd_recovery_sleep config.

Signed-off-by: David Zafman <dzafman@redhat.com>
@tchaikov
Copy link
Contributor

jenkins test make check

Copy link
Contributor

@ronen-fr ronen-fr left a comment

Choose a reason for hiding this comment

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

Seems OK, although I'd rather not count on timers and "large enough" sizes
for the test to succeed.
Apart from being fragile, it requires a pretty long test.

…ecovering pg

Change TEST_recovery_scrub_2 to create more objects and use
osd_recovery_sleep to prevent recovery from finihing before
we start to scrub.  Verify that at least 1 scrub was started
while the pg was reovering.

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

Signed-off-by: David Zafman <dzafman@redhat.com>
@tchaikov
Copy link
Contributor

@tchaikov tchaikov merged commit a5d6ecd into ceph:master Mar 15, 2021
@dzafman dzafman deleted the wip-49779 branch March 15, 2021 17:15
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