minor improvement - when migrating vm with volumes, if there's a failures, change the clvm vols to exclusive on source from shared, and on success, change dest vol to exclusive only for cross-pool migration

Author: Pearl Dsilva

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

@@ -2215,7 +2215,7 @@ public void copyAsync(Map<VolumeInfo, DataStore> volumeDataStoreMap, VirtualMach
                 }
             }
 
-            handlePostMigration(success, srcVolumeInfoToDestVolumeInfo, vmTO, destHost);
+            handlePostMigration(success, srcVolumeInfoToDestVolumeInfo, vmTO, srcHost, destHost);
 
             if (!success) {
                 if (migrateAnswer == null) {
@@ -2434,7 +2434,26 @@ String getVolumeBackingFile(VolumeInfo srcVolumeInfo) {
         return null;
     }
 
-    private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> srcVolumeInfoToDestVolumeInfo, VirtualMachineTO vmTO, Host destHost) {
+    private void sendClvmLockCommand(long hostId, StoragePoolVO pool, VolumeInfo volumeInfo,
+            ClvmLockTransferCommand.Operation operation) {
+        String vgName = pool.getPath();
+        if (vgName.startsWith("/")) {
+            vgName = vgName.substring(1);
+        }
+        String lvPath = String.format("/dev/%s/%s", vgName, volumeInfo.getPath());
+        try {
+            Answer answer = agentManager.send(hostId,
+                    new ClvmLockTransferCommand(operation, lvPath, volumeInfo.getUuid()));
+            if (answer == null || !answer.getResult()) {
+                String details = answer != null ? answer.getDetails() : "null answer";
+                logger.warn("CLVM lock command [{}] failed for LV [{}] on host [{}]: {}", operation, lvPath, hostId, details);
+            }
+        } catch (AgentUnavailableException | OperationTimedoutException e) {
+            logger.warn("Exception sending CLVM lock command [{}] for LV [{}] on host [{}]: {}", operation, lvPath, hostId, e.getMessage());
+        }
+    }
+
+    private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> srcVolumeInfoToDestVolumeInfo, VirtualMachineTO vmTO, Host srcHost, Host destHost) {
         if (!success) {
             try {
                 PrepareForMigrationCommand pfmc = new PrepareForMigrationCommand(vmTO);
@@ -2453,6 +2472,17 @@ private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> sr
             catch (Exception e) {
                 logger.debug("Failed to disconnect one or more (original) dest volumes", e);
             }
+
+            if (srcHost != null && srcHost.getHypervisorType() == HypervisorType.KVM) {
+                for (VolumeInfo srcVolumeInfo : srcVolumeInfoToDestVolumeInfo.keySet()) {
+                    StoragePoolVO srcPool = _storagePoolDao.findById(srcVolumeInfo.getPoolId());
+                    if (srcPool == null || !ClvmPoolManager.isClvmPoolType(srcPool.getPoolType())) {
+                        continue;
+                    }
+                    sendClvmLockCommand(srcHost.getId(), srcPool, srcVolumeInfo,
+                            ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE);
+                }
+            }
         }
 
         for (Map.Entry<VolumeInfo, VolumeInfo> entry : srcVolumeInfoToDestVolumeInfo.entrySet()) {
@@ -2480,6 +2510,15 @@ private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> sr
 
                 _volumeDao.update(volumeVO.getId(), volumeVO);
 
+                StoragePoolVO srcPoolVO = _storagePoolDao.findById(srcVolumeInfo.getPoolId());
+                StoragePoolVO destPoolVO = _storagePoolDao.findById(destVolumeInfo.getPoolId());
+                if (destPoolVO != null && ClvmPoolManager.isClvmPoolType(destPoolVO.getPoolType())
+                        && (srcPoolVO == null || srcPoolVO.getId() != destPoolVO.getId())) {
+                    sendClvmLockCommand(destHost.getId(), destPoolVO, destVolumeInfo,
+                            ClvmLockTransferCommand.Operation.ACTIVATE_EXCLUSIVE);
+                    clvmPoolManager.setClvmLockHostId(destVolumeInfo.getId(), destHost.getId());
+                }
+
                 _volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
 
                 // Update the volume ID for snapshots on secondary storage