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.

Sign up for GitHub

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

fix snapshot removal when image already merged #524

Merged
merged 1 commit into from
Aug 8, 2022
Merged

fix snapshot removal when image already merged #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...src/main/java/org/ovirt/engine/core/bll/snapshots/ColdMergeSnapshotSingleDiskCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected void executeCommand() {
// Let doPolling() drive the execution; we don't have any guarantee that
// executeCommand() will finish before doPolling() is called, and we don't
// want to possibly run the first command twice.
getParameters().setCommandStep(RemoveSnapshotSingleDiskStep.PREPARE_MERGE);
getParameters().setCommandStep(getInitialMergeStepForImage());
getParameters().setChildCommands(new HashMap<>());
setSucceeded(true);
}
Expand Down Expand Up @@ -113,6 +113,14 @@ public boolean performNextOperation(int completedChildCount) {
}
}

private RemoveSnapshotSingleDiskStep getInitialMergeStepForImage() {
if (getImageInfoFromVdsm(getDestinationDiskImage()) == null) {
ahadas marked this conversation as resolved.
Show resolved Hide resolved
log.info("Image does not exist, attempting to synchronize the database");
return RemoveSnapshotSingleDiskStep.COMPLETE;
}
return RemoveSnapshotSingleDiskStep.PREPARE_MERGE;
}

@Override
public void endSuccessfully() {
syncDbRecords(getImageInfoFromVdsm(getDiskImage()), Collections.singleton(getDestinationImageId()), true);
Expand Down
7 changes: 7 additions & 0 deletions ...rc/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskLiveCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@ private RemoveSnapshotSingleDiskStep getInitialMergeStepForImage(Guid imageId) {
return RemoveSnapshotSingleDiskStep.DESTROY_IMAGE;
}
}
if (getImageInfoFromVdsm(getDestinationDiskImage()) == null) {
log.info("Image does not exist, attempting to synchronize the database");
Set<Guid> imagesToRemove = new HashSet<>();
imagesToRemove.add(getDestinationDiskImage().getImageId());
getParameters().setMergeStatusReturnValue(new MergeStatusReturnValue(imagesToRemove));
return RemoveSnapshotSingleDiskStep.COMPLETE;
}
return RemoveSnapshotSingleDiskStep.EXTEND;
}

Expand Down