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

Backport: add callback to RemoveDiskCommand #716

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Backport: add callback to RemoveDiskCommand #716

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
20 changes: 19 additions & 1 deletion ...r/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
import java.util.concurrent.Future;
import java.util.stream.Collectors;

import javax.enterprise.inject.Instance;
import javax.inject.Inject;

import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.bll.CommandBase;
import org.ovirt.engine.core.bll.ConcurrentChildCommandsExecutionCallback;
import org.ovirt.engine.core.bll.DisableInPrepareMode;
import org.ovirt.engine.core.bll.LockMessage;
import org.ovirt.engine.core.bll.LockMessagesMatchUtil;
Expand All @@ -28,6 +30,7 @@
import org.ovirt.engine.core.bll.storage.disk.image.DisksFilter;
import org.ovirt.engine.core.bll.storage.disk.image.ImagesHandler;
import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil;
import org.ovirt.engine.core.bll.tasks.interfaces.CommandCallback;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.bll.validator.storage.DiskImagesValidator;
import org.ovirt.engine.core.bll.validator.storage.DiskOperationsValidator;
Expand Down Expand Up @@ -117,6 +120,8 @@ public class RemoveDiskCommand<T extends RemoveDiskParameters> extends CommandBa
private UnregisteredDisksDao unregisteredDisksDao;
@Inject
private CommandCoordinatorUtil commandCoordinatorUtil;
@Inject
private Instance<ConcurrentChildCommandsExecutionCallback> callbackProvider;

public RemoveDiskCommand(T parameters, CommandContext commandContext) {
super(parameters, commandContext);
Expand Down Expand Up @@ -398,7 +403,7 @@ private boolean canRemoveVmImageDisk() {

@Override
protected void executeCommand() {
switch (getDisk().getDiskStorageType()) {
switch (getDiskStorageType()) {
case IMAGE:
if (getDisk().getContentType() == DiskContentType.MEMORY_DUMP_VOLUME ||
getDisk().getContentType() == DiskContentType.MEMORY_METADATA_VOLUME) {
Expand Down Expand Up @@ -448,6 +453,7 @@ protected void executeCommand() {
if (getParameters().isUnregisteredDisk()) {
unregisteredDisksDao.removeUnregisteredDisk(getParameters().getDiskId(), getParameters().getStorageDomainId());
}
persistCommandIfNeeded();
}

private void removeManagedBlockStorageDisk() {
Expand Down Expand Up @@ -728,4 +734,16 @@ private Guid getQuotaId() {
@Override
public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionList) {
}

private DiskStorageType getDiskStorageType() {
if (getParameters().getDiskStorageType() == null) {
getParameters().setDiskStorageType(getDisk().getDiskStorageType());
}
return getParameters().getDiskStorageType();
}

@Override
public CommandCallback getCallback() {
return getDiskStorageType() == DiskStorageType.IMAGE ? callbackProvider.get() : null;
}
}
10 changes: 10 additions & 0 deletions ...odules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package org.ovirt.engine.core.common.action;
import org.ovirt.engine.core.common.businessentities.storage.DiskStorageType;
import org.ovirt.engine.core.compat.Guid;

public class RemoveDiskParameters extends ActionParametersBase {

private static final long serialVersionUID = -3691440035048144457L;
private Guid diskId;
private Guid storageDomainId;
private DiskStorageType diskStorageType = null;
private boolean forceDelete;
private boolean suppressContentTypeCheck;
private boolean unregisteredDisk;
Expand Down Expand Up @@ -61,4 +63,12 @@ public boolean isUnregisteredDisk() {
public void setUnregisteredDisk(boolean unregisteredDisk) {
this.unregisteredDisk = unregisteredDisk;
}

public DiskStorageType getDiskStorageType() {
return diskStorageType;
}

public void setDiskStorageType(DiskStorageType diskStorageType) {
this.diskStorageType = diskStorageType;
}
}