Use DeleteAllVmCheckpoints to remove inconsistent checkpoints

Instead of re-implement the functionality from DeleteAllVmCheckpoints, we just use DeleteAllVmCheckpoints and pass to force flag to allow DeleteAllVmCheckpoints to continue on failures. Signed-off-by: Jean-Louis Dupond <[email protected]>
oVirt · Dec 10, 2024 · 78f21ea · 78f21ea
1 parent 3872e24
commit 78f21ea
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/...l/src/main/java/org/ovirt/engine/core/bll/storage/backup/RedefineVmCheckpointCommand.java b/...l/src/main/java/org/ovirt/engine/core/bll/storage/backup/RedefineVmCheckpointCommand.java
@@ -1,5 +1,6 @@
 package org.ovirt.engine.core.bll.storage.backup;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -15,6 +16,9 @@
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.common.FeatureSupported;
 import org.ovirt.engine.core.common.VdcObjectType;
+import org.ovirt.engine.core.common.action.ActionParametersBase.EndProcedure;
+import org.ovirt.engine.core.common.action.ActionType;
+import org.ovirt.engine.core.common.action.DeleteAllVmCheckpointsParameters;
 import org.ovirt.engine.core.common.action.VmBackupParameters;
 import org.ovirt.engine.core.common.businessentities.ActionGroup;
 import org.ovirt.engine.core.common.businessentities.VmBackup;
@@ -25,10 +29,8 @@
 import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
 import org.ovirt.engine.core.common.vdscommands.VdsAndVmIDVDSParametersBase;
 import org.ovirt.engine.core.common.vdscommands.VmBackupVDSParameters;
-import org.ovirt.engine.core.common.vdscommands.VmCheckpointsVDSParameters;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dao.VmCheckpointDao;
-import org.ovirt.engine.core.utils.transaction.TransactionSupport;
 import org.ovirt.engine.core.vdsbroker.irsbroker.VmCheckpointIds;
 
 @NonTransactiveCommandAttribute
@@ -220,20 +222,21 @@ private VDSReturnValue performVmCheckpointsOperation(VDSCommandType vdsCommandTy
     }
 
     private void removeCheckpointChain(List<Guid> definedCheckpointsIds) {
-        for (Guid checkpointId : definedCheckpointsIds) {
-            // Best effort to remove all checkpoints in the chain from libvirt,
-            // starting from the oldest checkpoint to the leaf.
-            VmCheckpoint vmCheckpoint = new VmCheckpoint();
-            vmCheckpoint.setId(checkpointId);
-            performVmCheckpointsOperation(VDSCommandType.DeleteVmCheckpoints,
-                    new VmCheckpointsVDSParameters(getVdsId(), getVmId(), List.of(vmCheckpoint)));
-        }
-
-        // Removing all the checkpoints from the Engine database
-        TransactionSupport.executeInNewTransaction(() -> {
-            vmCheckpointDao.removeAllCheckpointsByVmId(getVmId());
-            return null;
-        });
+        // Collect all the images that were part of a backup.
+        List<DiskImage> imagesWithCheckpoints = definedCheckpointsIds.stream()
+                .map(vmCheckpoint -> vmCheckpointDao.getDisksByCheckpointId(vmCheckpoint))
+                .flatMap(List::stream)
+                .distinct()
+                .collect(Collectors.toCollection(ArrayList::new));
+
+        DeleteAllVmCheckpointsParameters deleteAllVmCheckpointsParameters =
+        new DeleteAllVmCheckpointsParameters(getVmId(), imagesWithCheckpoints);
+        deleteAllVmCheckpointsParameters.setParentCommand(getActionType());
+        deleteAllVmCheckpointsParameters.setParentParameters(getParameters());
+        deleteAllVmCheckpointsParameters.setEndProcedure(EndProcedure.COMMAND_MANAGED);
+        deleteAllVmCheckpointsParameters.setForce(true);
+
+        runInternalAction(ActionType.DeleteAllVmCheckpoints, deleteAllVmCheckpointsParameters);
     }
 
     @Override