tentacle: rbd-mirror: allow incomplete demote snapshot to sync after rbd-mirror daemon restart#66164
Merged
yuriw merged 2 commits intoceph:tentaclefrom Nov 17, 2025
Merged
Conversation
…plete to make wait_for_snapshot_sync_complete work for all cases. Signed-off-by: VinayBhaskar-V <vvarada@redhat.com> (cherry picked from commit c416807)
… daemon restart Currently when the rbd-mirror daemon on secondary was killed while a demote snapshot was newly created (0% copied) or partially synced, the image's promotion state was set to **PROMOTION_STATE_ORPHAN** upon restart of rbd-mirror daemon on secondary. This state prevents the demote snapshot sync after restart as bootstrap on secondary fails. In this commit we fix this by assigning promotion state to **PROMOTION_STATE_NON_PRIMARY** for an image with an **incomplete non-primary demote snapshot**. The downside is that if the image is removed on the primary cluster, then after restart of rbd-mirror daemon on secondary cluster, the corresponding image on the secondary also gets removed. This is because deletion propagation is unconditionally enabled precisely for **PROMOTION_STATE_NON_PRIMARY** images and this is okay since the user would have deleted the primary demoted image forcefully. Fixes: https://tracker.ceph.com/issues/73528 Signed-off-by: VinayBhaskar-V <vvarada@redhat.com> (cherry picked from commit 636a392)
idryomov
approved these changes
Nov 9, 2025
Contributor
|
jenkins test make check |
Contributor
|
jenkins test docs |
Contributor
|
jenkins test make check |
|
@yuriw please pick this PR in your tentacle branch testing. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/73737
backport of #65953
parent tracker: https://tracker.ceph.com/issues/73528
this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh