test 2

Author: Srivastava, Piyush

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java

@@ -87,21 +87,31 @@ public KVMPhysicalDisk createPhysicalDisk(String volumeUuid, KVMStoragePool pool
 
     @Override
     public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
+        logger.info("connectPhysicalDisk called: volumeUuid={}, pool.host={}, pool.port={}, pool.uuid={}", 
+                    volumeUuid, pool.getSourceHost(), pool.getSourcePort(), pool.getUuid());
+        
         // ex. sudo iscsiadm -m node -T iqn.2012-03.com.test:volume1 -p 192.168.233.10:3260 -o new
+        String iqnTarget = getIqn(volumeUuid);
+        logger.info("Parsed IQN from volumeUuid: {}", iqnTarget);
+        
         Script iScsiAdmCmd = new Script(true, "iscsiadm", 0, logger);
 
         iScsiAdmCmd.add("-m", "node");
-        iScsiAdmCmd.add("-T", getIqn(volumeUuid));
+        iScsiAdmCmd.add("-T", iqnTarget);
         iScsiAdmCmd.add("-p", pool.getSourceHost() + ":" + pool.getSourcePort());
         iScsiAdmCmd.add("-o", "new");
 
+        logger.info("Executing: iscsiadm -m node -T {} -p {}:{} -o new", iqnTarget, pool.getSourceHost(), pool.getSourcePort());
         String result = iScsiAdmCmd.execute();
+        logger.info("iscsiadm -o new result: {}", result == null ? "SUCCESS (null)" : result);
 
         if (result != null) {
             // Node record may already exist from a previous run; accept and proceed
             if (isNonFatalNodeCreate(result)) {
                 logger.debug("iSCSI node already exists for {}@{}:{}, proceeding", getIqn(volumeUuid), pool.getSourceHost(), pool.getSourcePort());
+                logger.info("iSCSI node already exists (non-fatal), proceeding");
             } else {
+                logger.info("Failed to add iSCSI target {}: {}", volumeUuid, result);
                 logger.debug("Failed to add iSCSI target " + volumeUuid);
                 System.out.println("Failed to add iSCSI target " + volumeUuid);
 
@@ -126,6 +136,7 @@ public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<S
                 // ex. sudo iscsiadm -m node -T iqn.2012-03.com.test:volume1 -p 192.168.233.10:3260 --op update -n node.session.auth.password -v password
                 executeChapCommand(volumeUuid, pool, "node.session.auth.password", chapInitiatorSecret, "password");
             } catch (Exception ex) {
+                logger.info("CHAP configuration failed for volumeUuid={}: {}", volumeUuid, ex.getMessage());
                 return false;
             }
         }
@@ -141,12 +152,16 @@ public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<S
         iScsiAdmCmd.add("-p", host + ":" + port);
         iScsiAdmCmd.add("--login");
 
+        logger.info("Executing: iscsiadm -m node -T {} -p {}:{} --login", iqn, host, port);
         result = iScsiAdmCmd.execute();
+        logger.info("iscsiadm --login result: {}", result == null ? "SUCCESS (null)" : result);
 
         if (result != null) {
             if (isNonFatalLogin(result)) {
                 logger.debug("iSCSI login returned benign message for {}@{}:{}: {}", iqn, host, port, result);
+                logger.info("iSCSI login returned benign message (non-fatal), proceeding");
             } else {
+                logger.info("Failed to log in to iSCSI target {}: {}", volumeUuid, result);
                 logger.debug("Failed to log in to iSCSI target " + volumeUuid + ": " + result);
                 System.out.println("Failed to log in to iSCSI target " + volumeUuid);
 
@@ -167,8 +182,10 @@ public boolean connectPhysicalDisk(String volumeUuid, KVMStoragePool pool, Map<S
         // After a certain number of tries and a certain waiting period in between tries,
         // this method could still return (it should not block indefinitely) (the race condition
         // isn't solved here, but made highly unlikely to be a problem).
+        logger.info("Waiting for disk to become available: volumeUuid={}", volumeUuid);
         waitForDiskToBecomeAvailable(volumeUuid, pool);
 
+        logger.info("connectPhysicalDisk completed successfully for volumeUuid={}", volumeUuid);
         return true;
     }
 

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java

@@ -33,6 +33,7 @@
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.DeleteStoragePoolCommand;
 import com.cloud.host.Host;
+import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePool;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
@@ -82,7 +83,17 @@ public boolean hostConnect(long hostId, long poolId)  {
             // Create the ModifyStoragePoolCommand to send to the agent
             // Note: Always send command even if database entry exists, because agent may have restarted
             // and lost in-memory pool registration. The command handler is idempotent.
-            ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(true, pool, detailsMap);
+            // For managed iSCSI pools, no local mount path is needed (null), only NFS pools need mount points
+            ModifyStoragePoolCommand cmd;
+            if (pool.getPoolType() == StoragePoolType.Iscsi) {
+                // iSCSI managed storage: no mount point, pass null for localPath
+                cmd = new ModifyStoragePoolCommand(true, pool, null, detailsMap);
+                logger.debug("Creating ModifyStoragePoolCommand for iSCSI pool {} without localPath", pool.getName());
+            } else {
+                // NFS/Other storage: use default mount path generation
+                cmd = new ModifyStoragePoolCommand(true, pool, detailsMap);
+                logger.debug("Creating ModifyStoragePoolCommand for {} pool {} with auto-generated localPath", pool.getPoolType(), pool.getName());
+            }
 
             Answer answer = _agentMgr.easySend(hostId, cmd);
 
@@ -107,19 +118,25 @@ public boolean hostConnect(long hostId, long poolId)  {
             }
 
             String localPath = poolInfo.getLocalPath();
-            logger.info("Storage pool {} successfully mounted at: {}", pool.getName(), localPath);
+            if (pool.getPoolType() == StoragePoolType.Iscsi) {
+                // iSCSI pools don't have mount points
+                logger.info("Storage pool {} successfully registered (iSCSI managed storage, no mount point)", pool.getName());
+            } else {
+                logger.info("Storage pool {} successfully mounted at: {}", pool.getName(), localPath);
+            }
 
-            // Update or create the storage_pool_host_ref entry with the correct local_path
+            // Update or create the storage_pool_host_ref entry
+            // For iSCSI pools, localPath may be null (no mount point)
             StoragePoolHostVO storagePoolHost = storagePoolHostDao.findByPoolHost(poolId, hostId);
 
             if (storagePoolHost == null) {
                 storagePoolHost = new StoragePoolHostVO(poolId, hostId, localPath);
                 storagePoolHostDao.persist(storagePoolHost);
-                logger.info("Created storage_pool_host_ref entry for pool {} and host {}", pool.getName(), host.getName());
+                logger.info("Created storage_pool_host_ref entry for pool {} and host {} with localPath: {}", pool.getName(), host.getName(), localPath);
             } else {
                 storagePoolHost.setLocalPath(localPath);
                 storagePoolHostDao.update(storagePoolHost.getId(), storagePoolHost);
-                logger.info("Updated storage_pool_host_ref entry with local_path: {}", localPath);
+                logger.info("Updated storage_pool_host_ref entry for pool {} with localPath: {}", pool.getName(), localPath);
             }
 
             // Update pool capacity/usage information