feature/CSTACKEX-122: Per host Igroup changes 3

Author: Srivastava, Piyush

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

@@ -149,7 +149,6 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
                     volumeVO.setPoolId(storagePool.getId());
 
                     if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
-                        String svmName = details.get(Constants.SVM_NAME);
                         String lunName = created != null && created.getLun() != null ? created.getLun().getName() : null;
                         if (lunName == null) {
                             throw new CloudRuntimeException("createAsync: Missing LUN name for volume " + volInfo.getId());
@@ -171,9 +170,12 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
                         volumeVO.setPath(null);
                         createCmdResult = new CreateCmdResult(lunName, new Answer(null, true, null));
                     } else if (ProtocolType.NFS3.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
+                        // For NFS, set path to volume UUID to ensure uniqueness
+                        // This prevents multiple VMs from using the same template file path
+                        volumeVO.setPath(volInfo.getUuid());
                         createCmdResult = new CreateCmdResult(volInfo.getUuid(), new Answer(null, true, null));
-                        s_logger.info("createAsync: Managed NFS volume [{}] associated with pool {}",
-                                volumeVO.getId(), storagePool.getId());
+                        s_logger.info("createAsync: Managed NFS volume [{}] with path [{}] associated with pool {}",
+                                volumeVO.getId(), volInfo.getUuid(), storagePool.getId());
                     }
                     volumeDao.update(volumeVO.getId(), volumeVO);
                 }
@@ -340,6 +342,7 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
                     }else{
                         s_logger.info("grantAccess: Igroup {} already exist for the host {}: ", accessGroup.getIgroup().getName() ,host.getName());
                         igroup = accessGroup.getIgroup();
+                        // TODO
                         // Verify host initiator is registered in the igroup before allowing access
 //                        if (sanStrategy.validateInitiatorInAccessGroup(host.getStorageUrl(), svmName, accessGroup.getIgroup())) {
 //                            // add host initiator to the igroup ? or fail here ?

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java

@@ -31,6 +31,8 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
 import org.apache.cloudstack.storage.command.CreateObjectCommand;
 import org.apache.cloudstack.storage.command.DeleteCommand;
+import com.cloud.agent.api.to.DataTO;
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.feign.FeignClientFactory;
 import org.apache.cloudstack.storage.feign.client.JobFeignClient;
@@ -87,10 +89,10 @@ public void setOntapStorage(OntapStorage ontapStorage) {
     public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume) {
         s_logger.info("createCloudStackVolume: Create cloudstack volume " + cloudstackVolume);
         try {
-            // Step 1: set cloudstack volume metadata
+            // Step 1: set cloudstack volume metadata and get the volumeUuid
             String volumeUuid = updateCloudStackVolumeMetadata(cloudstackVolume.getDatastoreId(), cloudstackVolume.getVolumeInfo());
-            // Step 2: Send command to KVM host to create qcow2 file using qemu-img
-            Answer answer = createVolumeOnKVMHost(cloudstackVolume.getVolumeInfo());
+            // Step 2: Send command to KVM host with explicit volumeUuid to avoid stale cached path
+            Answer answer = createVolumeOnKVMHost(cloudstackVolume.getVolumeInfo(), volumeUuid);
             if (answer == null || !answer.getResult()) {
                 String errMsg = answer != null ? answer.getDetails() : "Failed to create qcow2 on KVM host";
                 s_logger.error("createCloudStackVolume: " + errMsg);
@@ -480,21 +482,29 @@ private String updateCloudStackVolumeMetadata(String dataStoreId, DataObject vol
            String volumeUuid = volumeInfo.getUuid();
            volume.setPoolType(Storage.StoragePoolType.NetworkFilesystem);
            volume.setPoolId(Long.parseLong(dataStoreId));
-           volume.setPath(volumeUuid);  // Filename for qcow2 file
+           volume.setPath(volumeUuid);  // Filename for qcow2 file - unique per volume
            volumeDao.update(volume.getId(), volume);
+           s_logger.info("Updated volume path to {} for volume ID {}", volumeUuid, volumeId);
            return volumeUuid;
        }catch (Exception e){
            s_logger.error("Exception while updating volumeInfo: {} in volume: {}", dataStoreId, volumeInfo.getUuid(), e);
            throw new CloudRuntimeException("Exception while updating volumeInfo: " + e.getMessage());
        }
     }
 
-    private Answer createVolumeOnKVMHost(DataObject volumeInfo) {
-        s_logger.info("createVolumeOnKVMHost called with volumeInfo: {} ", volumeInfo);
+    private Answer createVolumeOnKVMHost(DataObject volumeInfo, String correctPath) {
+        s_logger.info("createVolumeOnKVMHost called with volumeInfo: {}, correctPath: {}", volumeInfo, correctPath);
 
         try {
+            // Get the base TO and override the path with correct value to avoid stale cached path
+            DataTO dataTO = volumeInfo.getTO();
+            if (dataTO instanceof VolumeObjectTO) {
+                VolumeObjectTO volumeTO = (VolumeObjectTO) dataTO;
+                s_logger.info("createVolumeOnKVMHost: Original TO path: {}, overriding with correct path: {}", volumeTO.getPath(), correctPath);
+                volumeTO.setPath(correctPath);  // Override stale path with correct UUID
+            }
             s_logger.info("createVolumeOnKVMHost: Sending CreateObjectCommand to KVM agent for volume: {}", volumeInfo.getUuid());
-            CreateObjectCommand cmd = new CreateObjectCommand(volumeInfo.getTO());
+            CreateObjectCommand cmd = new CreateObjectCommand(dataTO);
             EndPoint ep = epSelector.select(volumeInfo);
             if (ep == null) {
                 String errMsg = "No remote endpoint to send CreateObjectCommand, check if host is up";