fix snapshot removal when image already merged #524
Merged
Conversation
This file contains 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
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
3 times, most recently
from
c366725
to
6cc791a
Compare
mkemel
requested review from
emesika,
mwperina,
michalskrivanek,
oliel,
sgratch and
didib
as code owners
ahadas
changed the title
ahadas
reviewed
Jul 24, 2022
...l/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskLiveCommand.java
Outdated
Show resolved
Hide resolved
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
from
6cc791a
to
37a44f2
Compare
|
Ended up skipping the check that the volume is not in the chain already, as Benny suggested. |
ahadas
reviewed
Aug 3, 2022
...ll/src/main/java/org/ovirt/engine/core/bll/snapshots/ColdMergeSnapshotSingleDiskCommand.java
Show resolved
Hide resolved
barpavel
reviewed
Aug 3, 2022
...l/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskLiveCommand.java
Outdated
Show resolved
Hide resolved
|
/ost |
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
3 times, most recently
from
262eafd
to
561123f
Compare
ahadas
approved these changes
Aug 4, 2022
bennyz
reviewed
Aug 4, 2022
...ll/src/main/java/org/ovirt/engine/core/bll/snapshots/ColdMergeSnapshotSingleDiskCommand.java
Outdated
Show resolved
Hide resolved
bennyz
reviewed
Aug 4, 2022
...l/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskLiveCommand.java
Outdated
Show resolved
Hide resolved
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
from
561123f
to
5056166
Compare
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
from
5056166
to
34b81e6
Compare
barpavel
approved these changes
Aug 7, 2022
...ll/src/main/java/org/ovirt/engine/core/bll/snapshots/ColdMergeSnapshotSingleDiskCommand.java
Outdated
Show resolved
Hide resolved
mkemel
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
from
34b81e6
to
b45be93
Compare
When trying to remove a snapshot which was already removed before and image merged, but not removed from the DB for some reason - the RemoveSnapshot command fails and the snapshot and images stay in the DB and cannot be removed. The reason for this is that during RemoveSnapshotSingleDiskLiveCommand the DestroyImage command fails (since the image does not not exist), thus the whole command fails, and the snapshot/image are not removed from the DB. In the ColdMerge case, the ColdMergeSnapshotSingleDiskCommand fails already at the PrepareMerge stage. In this change, for both Live and Cold merge - we first check that the Destination image (or the Top Image) exists on storage with GetVolumeInfo. If it does not, we conclude that it was already merged and removed, and proceed to finishing the command successfully and removing the snapshot and the image from the DB, skipping all the steps. Bug-Url: https://bugzilla.redhat.com/1948599
ahadas
force-pushed
the
fix_remove_snapshot_with_merged_image
branch
from
b45be93
to
fdcdcac
Compare
bennyz
approved these changes
Aug 7, 2022
ahadas
approved these changes
Aug 7, 2022
|
/ost |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When trying to remove a snapshot which was already removed before
and image merged, but not removed from the DB for some reason -
the RemoveSnapshot command fails and the snapshot and images stay in
the DB and cannot be removed.
The reason for this is that during RemoveSnapshotSingleDiskLiveCommand
the DestroyImage command fails (since the image does not not exist),
thus the whole command fails, and the snapshot/image are not removed
from the DB.
In the ColdMerge case, the ColdMergeSnapshotSingleDiskCommand fails
already at the PrepareMerge stage.
In this change, for both Live and Cold merge - we first check that the
Destination image (or the Top Image) exists on storage with
GetVolumeInfo. If it does not, we conclude that it was already merged
and removed, and proceed to finishing the command successfully and
removing the snapshot and the image from the DB, skipping all the
steps.
Bug-Url: https://bugzilla.redhat.com/1948599