CSTACKEX-16 Fix Copy Issues

Author: Gupta, Surya

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

@@ -1144,6 +1144,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
             if (HypervisorType.KVM.equals(snapshotInfo.getHypervisorType()) && storagePoolVO.getPoolType() == StoragePoolType.PowerFlex) {
                 usingBackendSnapshot = false;
             }
+            logger.info("handleCopyAsyncToSecondaryStorage: usingBackendSnapshot {}", usingBackendSnapshot);
 
             if (usingBackendSnapshot) {
                 createVolumeFromSnapshot(snapshotInfo);
@@ -1181,7 +1182,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
             int primaryStorageDownloadWait = StorageManager.PRIMARY_STORAGE_DOWNLOAD_WAIT.value();
             CopyCommand copyCommand = new CopyCommand(snapshotInfo.getTO(), destOnStore.getTO(), primaryStorageDownloadWait,
                     VirtualMachineManager.ExecuteInSequence.value());
-
+            logger.info("handleCopyAsyncToSecondaryStorage: keepGrantedAccess {}", keepGrantedAccess);
             try {
                 if (!keepGrantedAccess) {
                     _volumeService.grantAccess(snapshotInfo, hostVO, srcDataStore);
@@ -1205,7 +1206,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
                 copyCommand.setOptions(srcDetails);
 
                 copyCmdAnswer = (CopyCmdAnswer)agentManager.send(hostVO.getId(), copyCommand);
-
+                logger.info("handleCopyAsyncToSecondaryStorage: copyCmdAnswer {}", copyCmdAnswer.getResult());
                 if (!copyCmdAnswer.getResult()) {
                     errMsg = copyCmdAnswer.getDetails();
 

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java

@@ -515,7 +515,6 @@ else if (volumeInfo.getFormat() == ImageFormat.OVA || volumeInfo.getFormat() ==
             }
 
             snapshotOnPrimary = result.getSnapshot();
-            snapshotOnPrimary.addPayload(snapshotInfo.getPayload());
         }
         finally {
             if (result != null && result.isSuccess()) {

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -555,11 +555,13 @@ private void grantAccessForSnapshot(SnapshotInfo snapshotInfo, Host host, Storag
 
             // Store DiskTO.IQN in snapshot_details so StorageSystemDataMotionStrategy.getSnapshotDetails()
             // can build the iSCSI source details for the CopyCommand sent to the KVM agent
-            String iqnPath = storagePool.getPath() + Constants.SLASH + lunNumber;
-            snapshotDetailsDao.addDetail(snapshotInfo.getId(), DiskTO.IQN, iqnPath, false);
+
+            // Update volume path if changed (e.g., after migration or re-mapping)
+            String iscsiPath = Constants.SLASH + storagePool.getPath() + Constants.SLASH + lunNumber;
+            snapshotDetailsDao.addDetail(snapshotInfo.getId(), DiskTO.IQN, iscsiPath, false);
 
             s_logger.info("grantAccessForSnapshot: Snapshot LUN [{}] mapped as LUN number [{}], IQN path [{}]",
-                    snapshotLunName, lunNumber, iqnPath);
+                    snapshotLunName, lunNumber, iscsiPath);
         }
     }
 

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -3880,11 +3880,8 @@ private Snapshot takeSnapshotInternal(Long volumeId, Long policyId, Long snapsho
 
         if (storagePoolVO.isManaged() && locationType == null) {
             logger.info("takeSnapshotInternal: locationType : {}", locationType);
-            if (isFileBasedStoragePool(storagePoolVO)) {
-                locationType = Snapshot.LocationType.PRIMARY;
-            } else {
-                // For managed, non-file-based storage (e.g., iSCSI), default to SECONDARY
-                // so that the snapshot gets copied to secondary storage via the backup pipeline.
+            locationType = Snapshot.LocationType.PRIMARY;
+            if (!isFileBasedStoragePool(storagePoolVO)) {
                 locationType = Snapshot.LocationType.SECONDARY;
             }
             logger.info("takeSnapshotInternal: locationType after : {}", locationType);