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

[DNM: NEEDS REBASE] nautilus: osd: Try other PGs when reservation failures occur #40142

Open
wants to merge 4 commits into
base: nautilus
Choose a base branch
from

Conversation

dzafman
Copy link
Contributor

@dzafman dzafman commented Mar 16, 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

Signed-off-by: David Zafman <dzafman@redhat.com>
This operates like the latest code from Pacific onwards.
It is need to make the test of parallelism work because
the PG can go into scrubbing then pause like a scrub which
takes time to finish would.

The old code needlessly did 2 sleeps in a row at the start,
first at INACTIVE then immediately again at NEW_CHUNK.

Signed-off-by: David Zafman <dzafman@redhat.com>
Fixes: https://tracker.ceph.com/issues/48843

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 08c3ede)

Conflicts:
	PendingReleaseNotes (trivial)
	src/osd/OSD.cc (trivial)
	src/osd/PG.cc (set_reserve_failed() in appropriate places)
	src/osd/PG.h (add reserve_failed to scrubber)
	src/osd/pg_scrubber.h (not present)
	src/osd/scrub_machine.cc (not present)
	src/osd/scrub_machine_lstnr.h (not present)
	src/osd/scrubber_common.h (not present)

Conflicts for Octopus to Nautilus:
	PendingReleaseNotes (trivial)
	src/osd/PG.cc (code moved around in Octopus)
	src/osd/PG.h (trivial)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit dd63577)

Increase osd_scrub_sleep time to 7 seconds to make it work in this older release

Nautilus: Use regular scrub requests instead of "ceph test #.# scrub"
Copy link
Member

@neha-ojha neha-ojha left a comment

Choose a reason for hiding this comment

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

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@jdurgin jdurgin changed the base branch from nautilus to nautilus-saved March 31, 2021 00:14
@jdurgin jdurgin changed the base branch from nautilus-saved to nautilus March 31, 2021 00:14
@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@idryomov idryomov changed the base branch from nautilus to nautilus-saved April 20, 2021 13:04
@idryomov idryomov changed the base branch from nautilus-saved to nautilus April 20, 2021 13:04
@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@jdurgin jdurgin changed the base branch from nautilus to nautilus-saved May 14, 2021 21:59
@jdurgin jdurgin changed the base branch from nautilus-saved to nautilus May 14, 2021 21:59
@tchaikov
Copy link
Contributor

tchaikov commented Jun 2, 2021

@dzafman needs rebase.

@smithfarm smithfarm changed the title nautilus: osd: Try other PGs when reservation failures occur [DNM: NEEDS REBASE] nautilus: osd: Try other PGs when reservation failures occur Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants