core: handling of non-existence disk image in TransferDiskImage#getSh…

…aredLocks Signed-off-by: Arik Hadas <ahadas@redhat.com>
oVirt · May 23, 2022 · 9979165 · 9979165
1 parent 3fa8188
commit 9979165
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.../src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java b/.../src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
@@ -436,7 +436,7 @@ 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, getDiskIsBeingTransferredLockMessage())));
@@ -446,12 +446,8 @@ protected Map<String, Pair<String, String>> getSharedLocks() {
     }
 
     private String getDiskIsBeingTransferredLockMessage() {
-        String diskName = "";
-        if (getDiskImage() != null) {
-            diskName = getDiskImage().getDiskAlias() != null ? getDiskImage().getDiskAlias() : "";
-        }
         return new LockMessage(EngineMessage.ACTION_TYPE_FAILED_DISK_IS_BEING_TRANSFERRED)
-                .withOptional("DiskName", diskName)
+                .withOptional("DiskName", getDiskImage().getDiskAlias() != null ? getDiskImage().getDiskAlias() : "")
                 .toString();
     }
 

diff --git a/...nager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java b/...nager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
@@ -1046,7 +1046,6 @@ public enum EngineMessage {
     ACTION_TYPE_FAILED_SNAPSHOT_IS_BEING_TAKEN_FOR_VM(ErrorType.CONFLICT),
     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),