feature/CSTACKEX-122: Per host Igroup changes

Author: Srivastava, Piyush

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

@@ -24,6 +24,7 @@
 import com.cloud.agent.api.to.DataTO;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.host.Host;
+import com.cloud.host.HostVO;
 import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
@@ -50,6 +51,7 @@
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.feign.model.Igroup;
 import org.apache.cloudstack.storage.feign.model.Lun;
 import org.apache.cloudstack.storage.service.SANStrategy;
 import org.apache.cloudstack.storage.service.StorageStrategy;
@@ -63,8 +65,10 @@
 import org.apache.logging.log4j.Logger;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -158,17 +162,26 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
                             volumeVO.setFolder(created.getLun().getUuid());
                         }
 
-                        // Create LUN-to-igroup mapping and retrieve the assigned LUN ID
-                        UnifiedSANStrategy sanStrategy = (UnifiedSANStrategy) Utility.getStrategyByStoragePoolDetails(details);
-                        String accessGroupName = Utility.getIgroupName(svmName, storagePoolUuid);
-                        String lunNumber = sanStrategy.ensureLunMapped(svmName, lunName, accessGroupName);
-
-                        // Construct iSCSI path: /<iqn>/<lun_id> format for KVM/libvirt attachment
-                        String iscsiPath = Constants.SLASH + storagePool.getPath() + Constants.SLASH + lunNumber;
-                        volumeVO.set_iScsiName(iscsiPath);
-                        volumeVO.setPath(iscsiPath);
-                        s_logger.info("createAsync: Volume [{}] iSCSI path set to {}", volumeVO.getId(), iscsiPath);
-                        createCmdResult = new CreateCmdResult(null, new Answer(null, true, null));
+                        s_logger.info("createAsync: Created LUN [{}] for volume [{}]. LUN mapping will occur during grantAccess() to per-host igroup.",
+                                lunName, volumeVO.getId());
+
+                        // Path will be set during grantAccess when LUN is mapped and we get the LUN ID
+                        // Return LUN name as identifier for CloudStack tracking
+                        volumeVO.set_iScsiName(null);
+                        volumeVO.setPath(null);
+                        createCmdResult = new CreateCmdResult(lunName, new Answer(null, true, null));
+
+//                        // Create LUN-to-igroup mapping and retrieve the assigned LUN ID
+//                        UnifiedSANStrategy sanStrategy = (UnifiedSANStrategy) Utility.getStrategyByStoragePoolDetails(details);
+//                        String accessGroupName = Utility.getIgroupName(svmName, storagePoolUuid);
+//                        String lunNumber = sanStrategy.ensureLunMapped(svmName, lunName, accessGroupName);
+//
+//                        // Construct iSCSI path: /<iqn>/<lun_id> format for KVM/libvirt attachment
+//                        String iscsiPath = Constants.SLASH + storagePool.getPath() + Constants.SLASH + lunNumber;
+//                        volumeVO.set_iScsiName(iscsiPath);
+//                        volumeVO.setPath(iscsiPath);
+//                        s_logger.info("createAsync: Volume [{}] iSCSI path set to {}", volumeVO.getId(), iscsiPath);
+//                        createCmdResult = new CreateCmdResult(null, new Answer(null, true, null));
 
                     } else if (ProtocolType.NFS3.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
                         createCmdResult = new CreateCmdResult(volInfo.getUuid(), new Answer(null, true, null));
@@ -319,12 +332,32 @@ public boolean grantAccess(DataObject dataObject, Host host, DataStore dataStore
                     // Only retrieve LUN name for iSCSI volumes
                     String cloudStackVolumeName = volumeDetailsDao.findDetail(volumeVO.getId(), Constants.LUN_DOT_NAME).getValue();
                     UnifiedSANStrategy sanStrategy = (UnifiedSANStrategy) Utility.getStrategyByStoragePoolDetails(details);
-                    String accessGroupName = Utility.getIgroupName(svmName, storagePoolUuid);
-
-                    // Verify host initiator is registered in the igroup before allowing access
-                    if (!sanStrategy.validateInitiatorInAccessGroup(host.getStorageUrl(), svmName, accessGroupName)) {
-                        throw new CloudRuntimeException("grantAccess: Host initiator [" + host.getStorageUrl() +
-                                "] is not present in iGroup [" + accessGroupName + "]");
+                    String accessGroupName = Utility.getIgroupName(svmName, host.getName());
+
+                    // Validate if Igroup exist ONTAP for this host as we may be using delete_on_unmap= true and igroup may be deleted by ONTAP automatically
+                    Map<String, String> getAccessGroupMap = Map.of(
+                            Constants.NAME, accessGroupName,
+                            Constants.SVM_DOT_NAME, svmName
+                    );
+                    Igroup igroup = new Igroup();
+                    AccessGroup accessGroup = sanStrategy.getAccessGroup(getAccessGroupMap);
+                    if(accessGroup == null || accessGroup.getIgroup() == null) {
+                        s_logger.info("grantAccess: Igroup does not exist for the host: Need to create Igroup " + host.getName());
+                        // create the igroup for the host and perform lun-mapping
+                        accessGroup = new AccessGroup();
+                        List<HostVO> hosts = new ArrayList<>();
+                        hosts.add((HostVO) host);
+                        accessGroup.setHostsToConnect(hosts);
+                        accessGroup.setStoragePoolId(storagePool.getId());
+                        accessGroup = sanStrategy.createAccessGroup(accessGroup);
+                    }else{
+                        s_logger.info("grantAccess: Igroup {} already exist for the host {}: ", accessGroup.getIgroup().getName() ,host.getName());
+                        igroup = accessGroup.getIgroup();
+                        // 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 ?
+//                        }
+                        // Use the existing igroup and perform lun-mapping
                     }
 
                     // Create or retrieve existing LUN mapping
@@ -453,7 +486,7 @@ private void revokeAccessForVolume(StoragePoolVO storagePool, VolumeVO volumeVO,
 
             // Verify host initiator is in the igroup before attempting to remove mapping
             SANStrategy sanStrategy = (UnifiedSANStrategy) storageStrategy;
-            if (!sanStrategy.validateInitiatorInAccessGroup(host.getStorageUrl(), svmName, accessGroup.getIgroup().getName())) {
+            if (!sanStrategy.validateInitiatorInAccessGroup(host.getStorageUrl(), svmName, accessGroup.getIgroup())) {
                 s_logger.warn("revokeAccessForVolume: Initiator [{}] is not in iGroup [{}], skipping revoke",
                         host.getStorageUrl(), accessGroupName);
                 return;
@@ -524,7 +557,6 @@ public long getUsedIops(StoragePool storagePool) {
 
     @Override
     public void takeSnapshot(SnapshotInfo snapshot, AsyncCompletionCallback<CreateCmdResult> callback) {
-
     }
 
     @Override
@@ -569,7 +601,6 @@ public boolean isVmInfoNeeded() {
 
     @Override
     public void provideVmInfo(long vmId, long volumeId) {
-
     }
 
     @Override

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -281,8 +281,11 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
         }
         PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
         List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInClusterForStorageConnection(primaryStore);
-        // TODO- need to check if no host to connect then throw exception or just continue?
         logger.debug("attachCluster: Eligible Up and Enabled hosts: {} in cluster {}", hostsToConnect, primaryStore.getClusterId());
+        if(hostsToConnect.isEmpty()) {
+            s_logger.info("attachCluster: No hosts found for primary storage");
+            throw new CloudRuntimeException("attachCluster: No hosts found for primary storage");
+        }
 
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(primaryStore.getId());
         StorageStrategy strategy = Utility.getStrategyByStoragePoolDetails(details);
@@ -294,22 +297,24 @@ public boolean attachCluster(DataStore dataStore, ClusterScope scope) {
             s_logger.error(errMsg);
             throw new CloudRuntimeException(errMsg);
         }
-
         logger.debug("attachCluster: Attaching the pool to each of the host in the cluster: {}", primaryStore.getClusterId());
-        //TODO - check if no host to connect then also need to create access group without initiators
-        if (hostsIdentifier != null && hostsIdentifier.size() > 0) {
-            try {
-                AccessGroup accessGroupRequest = new AccessGroup();
-                accessGroupRequest.setHostsToConnect(hostsToConnect);
-                accessGroupRequest.setScope(scope);
-                primaryStore.setDetails(details);// setting details as it does not come from cloudstack
-                accessGroupRequest.setPrimaryDataStoreInfo(primaryStore);
-                strategy.createAccessGroup(accessGroupRequest);
-            } catch (Exception e) {
-                s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
-                throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
+        // We need to create export policy at pool level and igroup at host level(in grantAccess)
+        if (ProtocolType.NFS3.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
+            if (!hostsIdentifier.isEmpty()) {
+                try {
+                    AccessGroup accessGroupRequest = new AccessGroup();
+                    accessGroupRequest.setHostsToConnect(hostsToConnect);
+                    accessGroupRequest.setScope(scope);
+                    primaryStore.setDetails(details);// setting details as it does not come from cloudstack
+                    accessGroupRequest.setStoragePoolId(storagePool.getId());
+                    strategy.createAccessGroup(accessGroupRequest);
+                } catch (Exception e) {
+                    s_logger.error("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
+                    throw new CloudRuntimeException("attachCluster: Failed to create access group on storage system for cluster: " + primaryStore.getClusterId() + ". Exception: " + e.getMessage());
+                }
             }
         }
+
         logger.debug("attachCluster: Attaching the pool to each of the host in the cluster: {}", primaryStore.getClusterId());
         for (HostVO host : hostsToConnect) {
             try {
@@ -347,30 +352,36 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
         PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)dataStore;
         List<HostVO> hostsToConnect = _resourceMgr.getEligibleUpAndEnabledHostsInZoneForStorageConnection(dataStore, scope.getScopeId(), Hypervisor.HypervisorType.KVM);
         logger.debug(String.format("In createPool. Attaching the pool to each of the hosts in %s.", hostsToConnect));
+        if(hostsToConnect.isEmpty()) {
+            s_logger.info("attachCluster: No hosts found for primary storage");
+            throw new CloudRuntimeException("attachCluster: No hosts found for primary storage");
+        }
 
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(primaryStore.getId());
         StorageStrategy strategy = Utility.getStrategyByStoragePoolDetails(details);
 
-        // TODO- need to check if no host to connect then throw exception or just continue
-        logger.debug("attachZone: Eligible Up and Enabled hosts: {}", hostsToConnect);
         ProtocolType protocol = ProtocolType.valueOf(details.get(Constants.PROTOCOL));
         //TODO- Check if we have to handle heterogeneous host within the zone
         if (!validateProtocolSupportAndFetchHostsIdentifier(hostsToConnect, protocol, hostsIdentifier)) {
             String errMsg = "attachZone: Not all hosts in the zone support the protocol: " + protocol.name();
             s_logger.error(errMsg);
             throw new CloudRuntimeException(errMsg);
         }
-        if (hostsIdentifier != null && !hostsIdentifier.isEmpty()) {
-            try {
-                AccessGroup accessGroupRequest = new AccessGroup();
-                accessGroupRequest.setHostsToConnect(hostsToConnect);
-                accessGroupRequest.setScope(scope);
-                primaryStore.setDetails(details); // setting details as it does not come from cloudstack
-                accessGroupRequest.setPrimaryDataStoreInfo(primaryStore);
-                strategy.createAccessGroup(accessGroupRequest);
-            } catch (Exception e) {
-                s_logger.error("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
-                throw new CloudRuntimeException("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
+
+        // We need to create export policy at pool level and igroup at host level
+        if (ProtocolType.NFS3.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) {
+            if (!hostsIdentifier.isEmpty()) {
+                try {
+                    AccessGroup accessGroupRequest = new AccessGroup();
+                    accessGroupRequest.setHostsToConnect(hostsToConnect);
+                    accessGroupRequest.setScope(scope);
+                    primaryStore.setDetails(details); // setting details as it does not come from cloudstack
+                    accessGroupRequest.setStoragePoolId(storagePool.getId());
+                    strategy.createAccessGroup(accessGroupRequest);
+                } catch (Exception e) {
+                    s_logger.error("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
+                    throw new CloudRuntimeException("attachZone: Failed to create access group on storage system for zone with Exception: " + e.getMessage());
+                }
             }
         }
         for (HostVO host : hostsToConnect) {
@@ -485,7 +496,7 @@ public boolean deleteDataStore(DataStore store) {
                         storagePoolId, e.getMessage(), e);
             }
             AccessGroup accessGroup = new AccessGroup();
-            accessGroup.setPrimaryDataStoreInfo(primaryDataStoreInfo);
+            accessGroup.setStoragePoolId(storagePoolId);
             // Delete access groups associated with this storage pool
             storageStrategy.deleteAccessGroup(accessGroup);
             s_logger.info("deleteDataStore: Successfully deleted access groups for storage pool '{}'", storagePool.getName());

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

@@ -19,9 +19,14 @@
 
 package org.apache.cloudstack.storage.service;
 
+import org.apache.cloudstack.storage.feign.model.Igroup;
+import org.apache.cloudstack.storage.feign.model.Initiator;
 import org.apache.cloudstack.storage.feign.model.OntapStorage;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public abstract class SANStrategy extends StorageStrategy {
+    private static final Logger s_logger = LogManager.getLogger(SANStrategy.class);
     public SANStrategy(OntapStorage ontapStorage) {
         super(ontapStorage);
     }
@@ -46,5 +51,22 @@ public SANStrategy(OntapStorage ontapStorage) {
      * @param accessGroupName the igroup name
      * @return true if the initiator is found in the igroup, false otherwise
      */
-    public abstract boolean validateInitiatorInAccessGroup(String hostInitiator, String svmName, String accessGroupName);
+    public boolean validateInitiatorInAccessGroup(String hostInitiator, String svmName, Igroup igroup) {
+        s_logger.info("validateInitiatorInAccessGroup: Validating initiator [{}] is in igroup [{}] on SVM [{}]", hostInitiator, igroup, svmName);
+
+        if (hostInitiator == null || hostInitiator.isEmpty()) {
+            s_logger.warn("validateInitiatorInAccessGroup: host initiator is null or empty");
+            return false;
+        }
+        if (igroup.getInitiators() != null) {
+            for (Initiator initiator : igroup.getInitiators()) {
+                if (initiator.getName().equalsIgnoreCase(hostInitiator)) {
+                    s_logger.info("validateInitiatorInAccessGroup: Initiator [{}] validated successfully in igroup [{}]", hostInitiator, igroup);
+                    return true;
+                }
+            }
+        }
+        s_logger.warn("validateInitiatorInAccessGroup: Initiator [{}] NOT found in igroup [{}]", hostInitiator, igroup);
+        return false;
+    }
 }