Allow Checkpoint removal to fail in some cases in DeleteAllVmCheckpoi…

…ntsCommand If there is checkpoint inconsistency between the checkpoints in the database and those on-disk, then we need to remove all checkpoints on-disk and in the database. But the on-disk removal can fail because the checkpoint is already gone because of some corruption (for example due to an unclean shutdown). Therefor we want to allow DeleteAllVmCheckpointsCommand to continue on failure in some cases. Signed-off-by: Jean-Louis Dupond <[email protected]>
oVirt · Oct 4, 2024 · d040fbd · d040fbd
1 parent 2c818d8
commit d040fbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...src/main/java/org/ovirt/engine/core/bll/storage/backup/DeleteAllVmCheckpointsCommand.java b/...src/main/java/org/ovirt/engine/core/bll/storage/backup/DeleteAllVmCheckpointsCommand.java
@@ -139,4 +139,9 @@ protected Map<String, Pair<String, String>> getSharedLocks() {
         return Collections.singletonMap(getParameters().getVmId().toString(),
                 LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_VM_IS_LOCKED));
     }
+
+    @Override
+    public boolean ignoreChildCommandFailure() {
+        return getParameters().isForce();
+    }
 }
diff --git a/...n/src/main/java/org/ovirt/engine/core/common/action/DeleteAllVmCheckpointsParameters.java b/...n/src/main/java/org/ovirt/engine/core/common/action/DeleteAllVmCheckpointsParameters.java
@@ -16,6 +16,7 @@ public class DeleteAllVmCheckpointsParameters extends VmOperationParameterBase {
     @NotNull
     private List<DiskImage> diskImages;
     private int completedDisksCount;
+    private boolean force;
 
     public DeleteAllVmCheckpointsParameters() {
     }
@@ -24,6 +25,7 @@ public DeleteAllVmCheckpointsParameters(Guid vmId, List<DiskImage> diskImages) {
         super(vmId);
         this.diskImages = diskImages;
         completedDisksCount = 0;
+        force = false;
     }
 
     public List<DiskImage> getDiskImages() {
@@ -41,4 +43,11 @@ public int getCompletedDisksCount() {
     public void setCompletedDisksCount(int completedDisksCount) {
         this.completedDisksCount = completedDisksCount;
     }
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
 }