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

Change conflict message to be more informative #383

Merged
merged 2 commits into from
May 23, 2022
Merged

Change conflict message to be more informative #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40e1db1
core:change conflict message to be more informative
ArtiomDivak May 19, 2022
155a374
core: handling of non-existence disk image in TransferDiskImage#getSh…
ahadas May 23, 2022
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
14 changes: 11 additions & 3 deletions .../src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import javax.inject.Inject;

import org.ovirt.engine.core.bll.CommandActionState;
import org.ovirt.engine.core.bll.LockMessage;
import org.ovirt.engine.core.bll.LockMessagesMatchUtil;
import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
import org.ovirt.engine.core.bll.ValidationResult;
Expand Down Expand Up @@ -435,14 +436,21 @@ protected Map<String, Pair<String, String>> getSharedLocks() {
// StartVmBackup should handle locks
return locks;
}
if (!Guid.isNullOrEmpty(getParameters().getImageId())) {
if (!Guid.isNullOrEmpty(getParameters().getImageId()) && getDiskImage() != null) {
List<VM> vms = vmDao.getVmsListForDisk(getDiskImage().getId(), true);
vms.forEach(vm -> locks.put(vm.getId().toString(),
LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_VM_IS_LOCKED)));
LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, getDiskIsBeingTransferredLockMessage())));
}

return locks;
}

private String getDiskIsBeingTransferredLockMessage() {
return new LockMessage(EngineMessage.ACTION_TYPE_FAILED_DISK_IS_BEING_TRANSFERRED)
.withOptional("DiskName", getDiskImage().getDiskAlias() != null ? getDiskImage().getDiskAlias() : "")
.toString();
}

@Override
protected Map<String, Pair<String, String>> getExclusiveLocks() {
Map<String, Pair<String, String>> locks = new HashMap<>();
Expand All @@ -452,7 +460,7 @@ protected Map<String, Pair<String, String>> getExclusiveLocks() {
}
if (getDiskImage() != null) {
locks.put(getDiskImage().getId().toString(),
LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK, EngineMessage.ACTION_TYPE_FAILED_DISK_IS_LOCKED));
LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK, getDiskIsBeingTransferredLockMessage()));
}
return locks;
}
Expand Down
1 change: 1 addition & 0 deletions ...nager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1047,6 +1047,7 @@ public enum EngineMessage {
ACTION_TYPE_FAILED_VM_IS_HIBERNATING(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_DISK_IS_USED_FOR_CREATE_VM(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_DISK_IS_BEING_REMOVED(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_DISK_IS_BEING_TRANSFERRED(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_OVF_DISK_IS_BEING_USED(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_UNSUPPORTED_OVF(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_DOMAIN_OVF_ON_UPDATE(ErrorType.CONFLICT),
Expand Down
1 change: 1 addition & 0 deletions ...min/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ ACTION_TYPE_FAILED_DISCARD_AFTER_DELETE_SUPPORTED_ONLY_BY_BLOCK_DOMAINS=Cannot $
ACTION_TYPE_FAILED_DISK_CONFIGURATION_NOT_SUPPORTED=Cannot ${action} ${type}. Disk configuration (${volumeFormat} ${volumeType} backup-${backup}) is incompatible with the storage domain type.
ACTION_TYPE_FAILED_DISK_HAS_SNAPSHOTS=Cannot ${action} ${type}. Disks with snapshots are not supported.
ACTION_TYPE_FAILED_DISK_IS_BEING_EXPORTED=Cannot ${action} ${type}. Disk ${DiskAlias} is being exported.
ACTION_TYPE_FAILED_DISK_IS_BEING_TRANSFERRED=Cannot ${action} ${type}. Disk ${DiskName} is being transferred.
ACTION_TYPE_FAILED_DISK_IS_BEING_CONVERTED=Cannot ${action} ${type}. Disk ${DiskAlias} is being converted.
ACTION_TYPE_FAILED_DISK_IS_BEING_MIGRATED=Cannot ${action} ${type}. Disk ${DiskName} is being moved or copied.
ACTION_TYPE_FAILED_DISK_IMAGE_CANNOT_BE_MEASURED_WHILE_USED=Cannot measure image ${imageId}, it is being used by a VM.
Expand Down