Skip to content

squid: rgw/multisite: handle errors properly in RGWDataFullSyncSingleEntryCR()#62307

Merged
yuriw merged 3 commits intoceph:squidfrom
adamemerson:wip-63378-squid
Apr 10, 2025
Merged

squid: rgw/multisite: handle errors properly in RGWDataFullSyncSingleEntryCR()#62307
yuriw merged 3 commits intoceph:squidfrom
adamemerson:wip-63378-squid

Conversation

@adamemerson
Copy link
Contributor

@adamemerson adamemerson commented Mar 14, 2025 •
edited
Loading

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

And through backport

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

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

Shilpa Jagannath added 3 commits March 14, 2025 14:02
@adamemerson
rg/multisite: if the first shard fails to sync, we must drain and ret…
71aa9f6 
…urn error.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 6764793)

Fixes: https://tracker.ceph.com/issues/68298
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
rgw/multisite: drain_all() after notify stack cancel
4cfa58b 
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit ed33120)

Fixes: https://tracker.ceph.com/issues/68298
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
rgw/multisite: no need to capture error from callback. we are already…
936099a 
… doing that within

RGWDataFullSyncSingleEntryCR()

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 34f8306)

Fixes: https://tracker.ceph.com/issues/68298
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson adamemerson added this to the v19.2.2 milestone Mar 14, 2025
@adamemerson adamemerson requested a review from a team as a code owner March 14, 2025 18:07
@adamemerson adamemerson requested a review from smanjara March 14, 2025 18:10
@adamemerson
Copy link
Contributor Author

adamemerson commented Mar 14, 2025

jenkins test make check

@yuriw
Copy link
Contributor

yuriw commented Mar 19, 2025

ref: https://tracker.ceph.com/issues/70386#change-290914

@ljflores
Copy link
Member

ljflores commented Apr 2, 2025

Rados approved: https://tracker.ceph.com/projects/rados/wiki/SQUID#httpstrackercephcomissues70717

@ljflores
Copy link
Member

ljflores commented Apr 2, 2025

jenkins test make check

@yuriw yuriw merged commit b587e89 into ceph:squid Apr 10, 2025
14 checks passed
@cbodley cbodley mentioned this pull request Jan 27, 2026
Open
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@smanjara smanjara smanjara approved these changes

Assignees

No one assigned

Labels

backport bug-fix needs-qa rgw wip-yuri11-testing

Projects

None yet

Milestone

v19.2.3

Development

Successfully merging this pull request may close these issues.

4 participants

@adamemerson @yuriw @ljflores @smanjara