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

Jump to bottom

quincy: osd: Change scrub cost in case of mClock scheduler #51728

Merged
merged 2 commits into from May 25, 2023
Merged

quincy: osd: Change scrub cost in case of mClock scheduler #51728

merged 2 commits into from May 25, 2023

Conversation

amathuria
Copy link
Contributor

@amathuria amathuria commented May 24, 2023 •
edited by ljflores

With osd_op_queue as WPQ, high costs were assigned to scrub in order to throttle it effectively. In the case of mClock scheduler, mClock parameters are used to do the throttling and the cost should represent a realistic value.

Fixes: https://tracker.ceph.com/issues/61313
Signed-off-by: Aishwarya Mathuria amathuri@redhat.com
(cherry picked from commit 43544d2)

Backport of #51656

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
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 dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@amathuria amathuria requested a review from a team as a code owner May 24, 2023 06:43
@github-actions github-actions bot added this to the quincy milestone May 24, 2023
@rzarzynski rzarzynski changed the title osd: Change scrub cost in case of mClock scheduler quincy: osd: Change scrub cost in case of mClock scheduler May 24, 2023
@amathuria amathuria force-pushed the wip-quincy-change-default-scrub-cost branch from 3290cc7 to dfdfcb9 Compare May 24, 2023 15:57
@neha-ojha neha-ojha requested a review from sseshasa May 24, 2023 17:28
@sseshasa
Copy link
Contributor

Changes look good. Some minor nits related to backport requirements need addressing:

  1. I set the state of the original tracker to "pending backport". This should automatically create backport trackers for quincy and reef that you can link these PRs to. For e.g., this PR can be linked to https://tracker.ceph.com/issues/61403.
  2. The conflicts message for commit dfdfcb9 should be pasted after the "cherry-picked from ..." line as shown in section https://github.com/ceph/ceph/blob/main/SubmittingPatches-backports.rst#conflict-resolution.

sseshasa
sseshasa approved these changes May 24, 2023
View reviewed changes
Copy link
Contributor

@sseshasa sseshasa left a comment

Choose a reason for hiding this comment

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

LGTM apart from the minor nits about the backport PRs and commit message.

@amathuria
Copy link
Contributor Author

Changes look good. Some minor nits related to backport requirements need addressing:

1. I set the state of the original tracker to "pending backport". This should automatically create backport trackers for quincy and reef that you can link these PRs to. For e.g., this PR can be linked to https://tracker.ceph.com/issues/61403.

2. The conflicts message for commit [dfdfcb9](https://github.com/ceph/ceph/commit/dfdfcb9ea4dfefa621a6794930a9400e70487a51) should be pasted after the "cherry-picked from ..." line as shown in section https://github.com/ceph/ceph/blob/main/SubmittingPatches-backports.rst#conflict-resolution.

Thanks @sseshasa I'll update the commit message.

@amathuria
osd: Change scrub cost in case of mClock scheduler
e476af8 
With osd_op_queue as WPQ, high costs were assigned to scrub in order to throttle it effectively.
In the case of mClock scheduler, mClock parameters are used to do the throttling and the cost should represent a realistic value.

Fixes: https://tracker.ceph.com/issues/61313
Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
(cherry picked from commit 43544d2)

src/osd/OSD.cc: We are using osd_scrub_chunk_max in the scrub cost calculation here.
@amathuria
osd: mClock default_min reservation should be 0
85c39a0 
All the mClock profiles enforce no minimum reservation for the background best-effort client.
For this purpose, the default_min value should 0 and not 1.

Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>
(cherry picked from commit 05848b4)
@amathuria amathuria force-pushed the wip-quincy-change-default-scrub-cost branch from 5c8b208 to 85c39a0 Compare May 25, 2023 02:59
@amathuria
Copy link
Contributor Author

jenkins test make check

2 similar comments
@amathuria
Copy link
Contributor Author

jenkins test make check

@amathuria
Copy link
Contributor Author

jenkins test make check

@ljflores
Copy link
Contributor

Rados suite review: https://tracker.ceph.com/projects/rados/wiki/QUINCY#httpstrellocomcpkxrazzW1763-wip-yuri3-testing-2023-05-24-1136-quincy-old-wip-yuri3-testing-2023-05-24-0845-quincy

@ljflores ljflores merged commit cd9ed90 into ceph:quincy May 25, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sseshasa sseshasa sseshasa approved these changes

Assignees
No one assigned
Labels
common core wip-yuri3-testing
Projects
None yet
Milestone
quincy
3 participants
@amathuria @sseshasa @ljflores