feature/CSTACKEX-122: Per host Igroup changes #37
+473
−523
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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; | ||
|
|
@@ -35,8 +36,6 @@ | |
| import com.cloud.storage.dao.VolumeDetailsDao; | ||
| import com.cloud.utils.Pair; | ||
| import com.cloud.utils.exception.CloudRuntimeException; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; | ||
| import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; | ||
|
|
@@ -53,6 +52,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.client.SnapshotFeignClient; | ||
| import org.apache.cloudstack.storage.feign.model.FlexVolSnapshot; | ||
| import org.apache.cloudstack.storage.feign.model.Lun; | ||
|
|
@@ -72,8 +72,9 @@ | |
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import javax.inject.Inject; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
|
|
@@ -86,7 +87,6 @@ public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver { | |
|
|
||
| @Inject private StoragePoolDetailsDao storagePoolDetailsDao; | ||
| @Inject private PrimaryDataStoreDao storagePoolDao; | ||
| @Inject private VolumeDao volumeDao; | ||
| @Inject private VolumeDetailsDao volumeDetailsDao; | ||
| @Inject private SnapshotDetailsDao snapshotDetailsDao; | ||
|
|
@@ -110,6 +110,12 @@ public DataStoreTO getStoreTO(DataStore store) { | |
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean volumesRequireGrantAccessWhenUsed(){ | ||
|
Collaborator
There was a problem hiding this comment. So, with this there would always be a grantAccess call before using a volume? |
||
| s_logger.info("OntapPrimaryDatastoreDriver: volumesRequireGrantAccessWhenUsed: Called"); | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Creates a volume on the ONTAP storage system. | ||
| */ | ||
|
|
@@ -154,7 +160,6 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet | |
| volumeVO.setPoolId(storagePool.getId()); | ||
|
|
||
| if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) { | ||
| String lunName = created != null && created.getLun() != null ? created.getLun().getName() : null; | ||
| if (lunName == null) { | ||
| throw new CloudRuntimeException("Missing LUN name for volume " + volInfo.getId()); | ||
|
|
@@ -167,22 +172,13 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet | |
| volumeVO.setFolder(created.getLun().getUuid()); | ||
| } | ||
|
|
||
| s_logger.info("createAsync: Created LUN [{}] for volume [{}]. LUN mapping will occur during grantAccess() to per-host igroup.", | ||
| lunName, volumeVO.getId()); | ||
| createCmdResult = new CreateCmdResult(lunName, 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)); | ||
| s_logger.info("createAsync: Managed NFS volume [{}] with path [{}] associated with pool {}", | ||
| volumeVO.getId(), volInfo.getUuid(), storagePool.getId()); | ||
| } | ||
| volumeDao.update(volumeVO.getId(), volumeVO); | ||
| } | ||
|
|
@@ -412,14 +408,35 @@ 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, 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) { | ||
|
There was a problem hiding this comment. as we discussed, we would need a implementation even for export policy(Access group) for NFS protocol, to handle vm power-off from host1 and power-on to host2. |
||
| s_logger.info("grantAccess: Igroup {} does not exist for the host {} : Need to create Igroup for the host ", accessGroupName, 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(); | ||
| /* TODO Below cases will be covered later, for now they will be a pre-requisite on customer side | ||
| 1. Igroup exist with the same name but host initiator has been rempved | ||
|
|
||
| 2. Igroup exist with the same name but host initiator has been changed may be due to new NIC or new adapter | ||
| In both cases we need to verify current host initiator is registered in the igroup before allowing access | ||
| Incase it is not , add it and proceed for lun-mapping | ||
| */ | ||
| } | ||
| s_logger.info("grantAccess: Igroup {} is present now with initiators {} ", accessGroup.getIgroup().getName(), accessGroup.getIgroup().getInitiators()); | ||
| // Create or retrieve existing LUN mapping | ||
| String lunNumber = sanStrategy.ensureLunMapped(svmName, cloudStackVolumeName, accessGroupName); | ||
|
|
||
|
|
@@ -464,22 +481,6 @@ public void revokeAccess(DataObject dataObject, Host host, DataStore dataStore) | |
| throw new InvalidParameterValueException("host should not be null"); | ||
| } | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Why was this removed? Did you test Enter and Cancel maintenance workflows with atleast one volume in SP? There was a problem hiding this comment. @sandeeplocharla we had discussion and this is required. |
||
| StoragePoolVO storagePool = storagePoolDao.findById(dataStore.getId()); | ||
| if (storagePool == null) { | ||
| s_logger.error("revokeAccess: Storage Pool not found for id: " + dataStore.getId()); | ||
|
|
@@ -517,10 +518,9 @@ private void revokeAccessForVolume(StoragePoolVO storagePool, VolumeVO volumeVO, | |
| Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(storagePool.getId()); | ||
| StorageStrategy storageStrategy = Utility.getStrategyByStoragePoolDetails(details); | ||
| String svmName = details.get(Constants.SVM_NAME); | ||
|
|
||
| if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(Constants.PROTOCOL))) { | ||
| String accessGroupName = Utility.getIgroupName(svmName, host.getName()); | ||
|
|
||
| // Retrieve LUN name from volume details; if missing, volume may not have been fully created | ||
| String lunName = volumeDetailsDao.findDetail(volumeVO.getId(), Constants.LUN_DOT_NAME) != null ? | ||
|
|
@@ -546,7 +546,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())) { | ||
| s_logger.warn("revokeAccessForVolume: Initiator [{}] is not in iGroup [{}], skipping revoke", | ||
| host.getStorageUrl(), accessGroupName); | ||
| return; | ||
|
|
@@ -915,7 +915,6 @@ public boolean isVmInfoNeeded() { | |
|
|
||
| @Override | ||
| public void provideVmInfo(long vmId, long volumeId) { | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what is the use of this change in the workflow?