Skip to content

Squid:Revert PR#59065 merge-A series of optimizations for kerneldevice discard#60641

Closed
SrinivasaBharath wants to merge 12 commits intoceph:squidfrom
SrinivasaBharath:wip-revert-pr59065
Closed

Squid:Revert PR#59065 merge-A series of optimizations for kerneldevice discard#60641
SrinivasaBharath wants to merge 12 commits intoceph:squidfrom
SrinivasaBharath:wip-revert-pr59065

Conversation

@SrinivasaBharath
Copy link
Contributor

@SrinivasaBharath SrinivasaBharath commented Nov 6, 2024 •
edited by ljflores
Loading

I accidentally merged the PR#59065pull request. To rectify this, I have created a new pull request to revert the merge and restore the previous, correct state of the codebase.

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

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
  • jenkins test rook e2e

@SrinivasaBharath
Revert "blk/kernel: Fix uninitialized discard_stop"
3ccf8c2 
This reverts commit 46d33cc.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "blk/KernelDevice: Unify discard thread management"
c6084df 
This reverts commit aa601fc.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "blk/KernelDevice: Fix several issues with stopping discard th…
8b016bb 
…reads"

This reverts commit 78a804c.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "blk/KernelDevice: React to bdev_enable_discard changes in han…
68cb0b3 
…dle_conf_change()"

This reverts commit d58c5c8.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "style changes requested by Igor"
dfeba9c 
This reverts commit c3dc1c4.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "Limit private discarded queue for threads to a small items co…
766a6c3 
…unt."

This reverts commit 1f0031e.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "On graceful shutdown we will wait for discard queue to drain …
2e11276 
…before storing the allocator."

This reverts commit d65eebc.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "os/BlueStore: NCB fix for leaked space when bdev_async_discar…
8ecfa4f 
…d is enabled"

This reverts commit cf86152.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "blk: support bdev_async_discard_threads == 0"
b13b03b 
This reverts commit a776b6e.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "common: remove lingering bdev_async_discard option"
6214d0a 
This reverts commit 519730b.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "blk: add threaded discard support to kernel devices"
471e6db 
This reverts commit 91b0fe4.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath
Revert "common: add discard threads option, descriptions and flags"
037a56d 
This reverts commit 1239568.
The commit was merged prematurely without testing.

Signed-off-by: Srinivasa Bharath Kanta <skanta@redhat.com>
@SrinivasaBharath SrinivasaBharath requested a review from a team as a code owner November 6, 2024 10:53
@ljflores ljflores changed the base branch from wip-revert-pr59065 to squid November 6, 2024 23:16
@ljflores ljflores mentioned this pull request Nov 6, 2024
Merged
14 tasks
@adamemerson
Copy link
Contributor

adamemerson commented Nov 12, 2024

@ljflores Just going through looking for squid PRs not on a milestone. Should this be pulled in?

@github-actions
Copy link

github-actions bot commented Nov 27, 2024

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

@github-actions
Copy link

github-actions bot commented Jan 26, 2025

This pull request has been automatically marked as stale because it has not had any activity for 60 days. It will be closed if no further activity occurs for another 30 days.
If you are a maintainer or core committer, please follow-up on this pull request to identify what steps should be taken by the author to move this proposed change forward.
If you are the author of this pull request, thank you for your proposed contribution. If you believe this change is still appropriate, please ensure that any feedback has been addressed and ask for a code review.

@github-actions github-actions bot added the stale label Jan 26, 2025
@github-actions
Copy link

github-actions bot commented Feb 25, 2025

This pull request has been automatically closed because there has been no activity for 90 days. Please feel free to reopen this pull request (or open a new one) if the proposed change is still appropriate. Thank you for your contribution!

@github-actions github-actions bot closed this Feb 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ljflores ljflores Awaiting requested review from ljflores

Assignees

No one assigned

Labels

bluestore common core needs-rebase stale

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SrinivasaBharath @adamemerson