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

core: copy disk will set the correct allocation policy for the new copied disk #397

Merged
merged 1 commit into from
Jun 2, 2022
Merged

core: copy disk will set the correct allocation policy for the new copied disk #397

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
1 change: 1 addition & 0 deletions ...main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupWithDataCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ private void createVolume() {
parameters.setParentCommand(getActionType());
parameters.setParentParameters(getParameters());
parameters.setEndProcedure(EndProcedure.COMMAND_MANAGED);
parameters.setBackup(getDiskImage().getBackup());
runInternalAction(ActionType.CreateVolumeContainer, parameters);
}

Expand Down
5 changes: 3 additions & 2 deletions .../main/java/org/ovirt/engine/core/bll/storage/disk/image/CreateVolumeContainerCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ActionType;
import org.ovirt.engine.core.common.action.CreateVolumeContainerCommandParameters;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskType;
import org.ovirt.engine.core.common.businessentities.storage.DiskBackup;
import org.ovirt.engine.core.common.businessentities.storage.DiskContentType;
import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
Expand Down Expand Up @@ -81,7 +81,8 @@ private CreateVolumeVDSCommandParameters getCreateVDSCommandParameters() {
}

private VolumeType getType() {
if (getParentParameters() != null && getParentParameters().getParentCommand() == ActionType.ConvertDisk) {
// When the incremental backup flag is set, we have no limitation on the format/allocation policy combination
if (getParameters().getBackup() == DiskBackup.Incremental) {
return getParameters().getVolumeType();
}

Expand Down
11 changes: 11 additions & 0 deletions ...main/java/org/ovirt/engine/core/common/action/CreateVolumeContainerCommandParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.action;

import org.ovirt.engine.core.common.businessentities.storage.DiskBackup;
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.storage.VolumeType;
import org.ovirt.engine.core.compat.Guid;
Expand All @@ -15,6 +16,8 @@ public class CreateVolumeContainerCommandParameters extends StorageJobCommandPar

private Integer sequenceNumber;

private DiskBackup backup;

public CreateVolumeContainerCommandParameters() {
}

Expand Down Expand Up @@ -100,4 +103,12 @@ public Integer getSequenceNumber() {
public void setSequenceNumber(Integer sequenceNumber) {
this.sequenceNumber = sequenceNumber;
}

public DiskBackup getBackup() {
return backup;
}

public void setBackup(DiskBackup backup) {
this.backup = backup;
}
}