Skip to content

Commit

Permalink
core: pass DiskBackup to CreateVolumeContainer
Browse files Browse the repository at this point in the history
Not passing DiskBackup from ConvertDiskCommand will result in the
allocation policy being overriden and consequnetly fail the conversion.

This patch sets DiskBackup and always passes it to ConvertDiskCommand.

Bug-Url: https://bugzilla.redhat.com/2108012
Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com>
  • Loading branch information
bennyz committed Jul 20, 2022
1 parent bf9bc28 commit 09891bb
Showing 1 changed file with 7 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VdsmImageLocationInfo;
import org.ovirt.engine.core.common.businessentities.storage.DiskBackup;
import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
import org.ovirt.engine.core.common.businessentities.storage.ImageStatus;
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
Expand Down Expand Up @@ -249,6 +250,7 @@ private CreateVolumeContainerCommandParameters createVolumeCreationParameters(Di
parameters.setParentParameters(getParameters());
parameters.setEndProcedure(ActionParametersBase.EndProcedure.COMMAND_MANAGED);
parameters.setParentCommand(getActionType());
parameters.setBackup(getBackup(diskImage));
parameters.setEntityInfo(new EntityInfo(VdcObjectType.Disk, diskImage.getId()));
return parameters;
}
Expand Down Expand Up @@ -346,6 +348,11 @@ private VolumeFormat getVolumeFormat(DiskImage diskImage) {
getParameters().getVolumeFormat();
}

private DiskBackup getBackup(DiskImage diskImage) {
return getParameters().getBackup() == null ? diskImage.getBackup() :
getParameters().getBackup();
}

private VdsmImageLocationInfo getLocationInfo() {
return (VdsmImageLocationInfo) getParameters().getLocationInfo();
}
Expand Down

0 comments on commit 09891bb

Please sign in to comment.