Address comments - add early return guard to reduce indentation

Author: Pearl Dsilva

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3159,9 +3159,7 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
 
         final VirtualMachineTO to = toVmTO(profile);
 
-        if (vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId())) {
-            executePreMigrationCommand(to, vm.getInstanceName(), srcHostId);
-        }
+        executePreMigrationCommand(vm, to, srcHostId);
 
         final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
         setVmNetworkDetails(vm, to);
@@ -3335,25 +3333,26 @@ protected void migrate(final VMInstanceVO vm, final long srcHostId, final Deploy
     }
 
     private void executePostMigrationCommand(VMInstanceVO vm, VirtualMachineTO to, long dstHostId) {
-        if (vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId())) {
-            try {
-                logger.info("Executing post-migration tasks for VM {} with CLVM volumes on destination host {}", vm.getInstanceName(), dstHostId);
-                final PostMigrationCommand postMigrationCommand = new PostMigrationCommand(to, vm.getInstanceName());
-                final Answer postMigrationAnswer = _agentMgr.send(dstHostId, postMigrationCommand);
-
-                if (postMigrationAnswer == null || !postMigrationAnswer.getResult()) {
-                    final String details = postMigrationAnswer != null ? postMigrationAnswer.getDetails() : "null answer returned";
-                    logger.warn("Post-migration tasks failed for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
-                            vm.getInstanceName(), dstHostId, details);
-                } else {
-                    logger.info("Successfully completed post-migration tasks for VM {} on destination host {}", vm.getInstanceName(), dstHostId);
-                }
-            } catch (Exception e) {
-                logger.warn("Exception during post-migration tasks for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
-                        vm.getInstanceName(), dstHostId, e.getMessage(), e);
+        if (!(vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId()))) {
+            return;
+        }
+        final String dstHostUuid = _hostDao.findById(dstHostId).getUuid();
+        try {
+            logger.info("Executing post-migration tasks for VM {} with CLVM volumes on destination host {}", vm.getInstanceName(), dstHostUuid);
+            final PostMigrationCommand postMigrationCommand = new PostMigrationCommand(to, vm.getInstanceName());
+            final Answer postMigrationAnswer = _agentMgr.send(dstHostId, postMigrationCommand);
+
+            if (postMigrationAnswer == null || !postMigrationAnswer.getResult()) {
+                final String details = postMigrationAnswer != null ? postMigrationAnswer.getDetails() : "null answer returned";
+                logger.warn("Post-migration tasks failed for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
+                        vm.getInstanceName(), dstHostUuid, details);
+            } else {
+                logger.info("Successfully completed post-migration tasks for VM {} on destination host {}", vm.getInstanceName(), dstHostUuid);
             }
+        } catch (Exception e) {
+            logger.warn("Exception during post-migration tasks for VM {} on destination host {}: {}. Migration completed but some cleanup may be needed.",
+                    vm.getInstanceName(), dstHostUuid, e.getMessage(), e);
         }
-
         updateClvmLockHostForVmVolumes(vm.getId(), dstHostId);
     }
 
@@ -4983,9 +4982,7 @@ private void orchestrateMigrateForScale(final String vmUuid, final long srcHostI
 
         // Step 1: Send PreMigrationCommand to source host to convert CLVM volumes to shared mode
         // This must happen BEFORE PrepareForMigrationCommand on destination to avoid lock conflicts
-        if (vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId())) {
-            executePreMigrationCommand(to, vm.getInstanceName(), srcHostId);
-        }
+        executePreMigrationCommand(vm, to, srcHostId);
 
         // Step 2: Send PrepareForMigrationCommand to destination host
         final PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(to);
@@ -5072,6 +5069,7 @@ private void orchestrateMigrateForScale(final String vmUuid, final long srcHostI
             }
 
             migrated = true;
+            executePostMigrationCommand(vm, to, dstHostId);
         } finally {
             if (!migrated) {
                 logger.info("Migration was unsuccessful.  Cleaning up: {}", vm);
@@ -6514,21 +6512,26 @@ private boolean hasClvmVolumes(long vmId) {
             .anyMatch(pool -> pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType()));
     }
 
-    private void executePreMigrationCommand(VirtualMachineTO to, String vmInstanceName, long srcHostId) {
-        logger.info("Sending PreMigrationCommand to source host {} for VM {} with CLVM volumes", srcHostId, vmInstanceName);
+    private void executePreMigrationCommand(VMInstanceVO vm, VirtualMachineTO to, long srcHostId) {
+        if (!(vm.getHypervisorType() == HypervisorType.KVM && hasClvmVolumes(vm.getId()))) {
+            return;
+        }
+        final String vmInstanceName = vm.getInstanceName();
+        final String srcHostUuid = _hostDao.findById(srcHostId).getUuid();
+        logger.info("Sending PreMigrationCommand to source host {} for VM {} with CLVM volumes", srcHostUuid, vmInstanceName);
         final PreMigrationCommand preMigCmd = new PreMigrationCommand(to, vmInstanceName);
         Answer preMigAnswer = null;
         try {
             preMigAnswer = _agentMgr.send(srcHostId, preMigCmd);
             if (preMigAnswer == null || !preMigAnswer.getResult()) {
                 final String details = preMigAnswer != null ? preMigAnswer.getDetails() : "null answer returned";
                 final String msg = "Failed to prepare source host for migration: " + details;
-                logger.error("Failed to prepare source host {} for migration of VM {}: {}", srcHostId, vmInstanceName, details);
+                logger.error("Failed to prepare source host {} for migration of VM {}: {}", srcHostUuid, vmInstanceName, details);
                 throw new CloudRuntimeException(msg);
             }
-            logger.info("Successfully prepared source host {} for migration of VM {}", srcHostId, vmInstanceName);
+            logger.info("Successfully prepared source host {} for migration of VM {}", srcHostUuid, vmInstanceName);
         } catch (final AgentUnavailableException | OperationTimedoutException e) {
-            logger.error("Failed to send PreMigrationCommand to source host {}: {}", srcHostId, e.getMessage(), e);
+            logger.error("Failed to send PreMigrationCommand to source host {}: {}", srcHostUuid, e.getMessage(), e);
             throw new CloudRuntimeException("Failed to prepare source host for migration: " + e.getMessage(), e);
         }
     }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -862,19 +862,20 @@ private Long getClvmLockHostFromVmVolumes(Long vmId) {
             }
 
             StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
-            if (pool != null && ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
-                Long lockHostId = clvmPoolManager.getClvmLockHostId(
-                        volume.getId(),
-                        volume.getUuid(),
-                        volume.getPath(),
-                        pool,
-                        true
-                );
-                if (lockHostId != null) {
-                    logger.debug("Found actual CLVM lock host {} from volume {} of VM {} via LVM query",
-                            lockHostId, volume.getUuid(), vmId);
-                    return lockHostId;
-                }
+            if (pool == null || !ClvmPoolManager.isClvmPoolType(pool.getPoolType())) {
+                continue;
+            }
+            Long lockHostId = clvmPoolManager.getClvmLockHostId(
+                    volume.getId(),
+                    volume.getUuid(),
+                    volume.getPath(),
+                    pool,
+                    true
+            );
+            if (lockHostId != null) {
+                logger.debug("Found actual CLVM lock host {} from volume {} of VM {} via LVM query",
+                        lockHostId, volume.getUuid(), vmId);
+                return lockHostId;
             }
         }
 

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java

@@ -337,23 +337,25 @@ protected Answer copyVolumeFromSnapshot(DataObject snapObj, DataObject volObj) {
     }
 
     private void updateLockHostForVolume(EndPoint ep, DataObject volObj) {
-        if (ep != null && volObj instanceof VolumeInfo) {
-            VolumeInfo volumeInfo = (VolumeInfo) volObj;
-            StoragePool destPool = (StoragePool) volObj.getDataStore();
-            if (destPool != null && ClvmPoolManager.isClvmPoolType(destPool.getPoolType())) {
-                Long hostId = ep.getId();
-                Long existingHostId = clvmPoolManager.getClvmLockHostId(
-                        volumeInfo.getId(),
-                        volumeInfo.getUuid(),
-                        volumeInfo.getPath(),
-                        destPool,
-                        true
-                );
-                if (existingHostId == null) {
-                    clvmPoolManager.setClvmLockHostId(volumeInfo.getId(), hostId);
-                    logger.debug("Set lock host ID {} for CLVM volume {} being created from snapshot", hostId, volumeInfo.getId());
-                }
-            }
+        if (ep == null || !(volObj instanceof VolumeInfo)) {
+            return;
+        }
+        VolumeInfo volumeInfo = (VolumeInfo) volObj;
+        StoragePool destPool = (StoragePool) volObj.getDataStore();
+        if (destPool == null || !ClvmPoolManager.isClvmPoolType(destPool.getPoolType())) {
+            return;
+        }
+        Long hostId = ep.getId();
+        Long existingHostId = clvmPoolManager.getClvmLockHostId(
+                volumeInfo.getId(),
+                volumeInfo.getUuid(),
+                volumeInfo.getPath(),
+                destPool,
+                true
+        );
+        if (existingHostId == null) {
+            clvmPoolManager.setClvmLockHostId(volumeInfo.getId(), hostId);
+            logger.debug("Set lock host ID {} for CLVM volume {} being created from snapshot", hostId, volumeInfo.getId());
         }
     }
 

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java

@@ -2160,7 +2160,9 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
             for (VolumeInfo vol : samePoolClvmVolumes) {
                 StoragePoolVO samePoolClvmPool = _storagePoolDao.findById(vol.getPoolId());
                 String vgName = samePoolClvmPool.getPath();
-                if (vgName.startsWith("/")) vgName = vgName.substring(1);
+                if (vgName.startsWith("/")) {
+                    vgName = vgName.substring(1);
+                }
                 String lvPath = String.format("/dev/%s/%s", vgName, vol.getPath());
                 logger.info("Activating CLVM volume [{}] in shared mode on dest host [{}] for same-pool migration.",
                         vol.getUuid(), destHost.getId());