Github user DaanHoogland commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1403#discussion_r62876182
--- Diff:
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
---
@@ -361,59 +603,221 @@ private String getProperty(long snapshotId, String
property) {
}
private Map<String, String> getVolumeDetails(VolumeInfo volumeInfo) {
- Map<String, String> sourceDetails = new HashMap<String, String>();
+ Map<String, String> volumeDetails = new HashMap<String, String>();
VolumeVO volumeVO = _volumeDao.findById(volumeInfo.getId());
long storagePoolId = volumeVO.getPoolId();
StoragePoolVO storagePoolVO =
_storagePoolDao.findById(storagePoolId);
- sourceDetails.put(DiskTO.STORAGE_HOST,
storagePoolVO.getHostAddress());
- sourceDetails.put(DiskTO.STORAGE_PORT,
String.valueOf(storagePoolVO.getPort()));
- sourceDetails.put(DiskTO.IQN, volumeVO.get_iScsiName());
+ volumeDetails.put(DiskTO.STORAGE_HOST,
storagePoolVO.getHostAddress());
+ volumeDetails.put(DiskTO.STORAGE_PORT,
String.valueOf(storagePoolVO.getPort()));
+ volumeDetails.put(DiskTO.IQN, volumeVO.get_iScsiName());
ChapInfo chapInfo = _volumeService.getChapInfo(volumeInfo,
volumeInfo.getDataStore());
if (chapInfo != null) {
- sourceDetails.put(DiskTO.CHAP_INITIATOR_USERNAME,
chapInfo.getInitiatorUsername());
- sourceDetails.put(DiskTO.CHAP_INITIATOR_SECRET,
chapInfo.getInitiatorSecret());
- sourceDetails.put(DiskTO.CHAP_TARGET_USERNAME,
chapInfo.getTargetUsername());
- sourceDetails.put(DiskTO.CHAP_TARGET_SECRET,
chapInfo.getTargetSecret());
+ volumeDetails.put(DiskTO.CHAP_INITIATOR_USERNAME,
chapInfo.getInitiatorUsername());
+ volumeDetails.put(DiskTO.CHAP_INITIATOR_SECRET,
chapInfo.getInitiatorSecret());
+ volumeDetails.put(DiskTO.CHAP_TARGET_USERNAME,
chapInfo.getTargetUsername());
+ volumeDetails.put(DiskTO.CHAP_TARGET_SECRET,
chapInfo.getTargetSecret());
}
- return sourceDetails;
+ return volumeDetails;
+ }
+
+ private Map<String, String> getSnapshotDetails(SnapshotInfo
snapshotInfo) {
+ Map<String, String> snapshotDetails = new HashMap<String,
String>();
+
+ long storagePoolId = snapshotInfo.getDataStore().getId();
+ StoragePoolVO storagePoolVO =
_storagePoolDao.findById(storagePoolId);
+
+ snapshotDetails.put(DiskTO.STORAGE_HOST,
storagePoolVO.getHostAddress());
+ snapshotDetails.put(DiskTO.STORAGE_PORT,
String.valueOf(storagePoolVO.getPort()));
+
+ long snapshotId = snapshotInfo.getId();
+
+ snapshotDetails.put(DiskTO.IQN, getProperty(snapshotId,
DiskTO.IQN));
+
+ snapshotDetails.put(DiskTO.CHAP_INITIATOR_USERNAME,
getProperty(snapshotId, DiskTO.CHAP_INITIATOR_USERNAME));
+ snapshotDetails.put(DiskTO.CHAP_INITIATOR_SECRET,
getProperty(snapshotId, DiskTO.CHAP_INITIATOR_SECRET));
+ snapshotDetails.put(DiskTO.CHAP_TARGET_USERNAME,
getProperty(snapshotId, DiskTO.CHAP_TARGET_USERNAME));
+ snapshotDetails.put(DiskTO.CHAP_TARGET_SECRET,
getProperty(snapshotId, DiskTO.CHAP_TARGET_SECRET));
+
+ return snapshotDetails;
}
- public HostVO getHost(long dataStoreId) {
- StoragePoolVO storagePoolVO =
_storagePoolDao.findById(dataStoreId);
+ private HostVO getHost(SnapshotInfo snapshotInfo) {
+ HostVO hostVO = getHost(snapshotInfo.getDataCenterId(), true);
- List<? extends Cluster> clusters =
_mgr.searchForClusters(storagePoolVO.getDataCenterId(), new Long(0),
Long.MAX_VALUE, HypervisorType.XenServer.toString());
+ if (hostVO == null) {
+ hostVO = getHost(snapshotInfo.getDataCenterId(), false);
- if (clusters == null) {
- throw new CloudRuntimeException("Unable to locate an
applicable cluster");
+ if (hostVO == null) {
+ throw new CloudRuntimeException("Unable to locate an
applicable host in data center with ID = " + snapshotInfo.getDataCenterId());
+ }
}
- for (Cluster cluster : clusters) {
- if (cluster.getAllocationState() == AllocationState.Enabled) {
- List<HostVO> hosts =
_hostDao.findByClusterId(cluster.getId());
+ return hostVO;
+ }
- if (hosts != null) {
- for (HostVO host : hosts) {
- if (host.getResourceState() ==
ResourceState.Enabled) {
- return host;
- }
- }
+ private HostVO getHost(Long zoneId, boolean
computeClusterMustSupportResign) {
+ Preconditions.checkArgument(zoneId != null, "Zone ID cannot be
null.");
+
+ List<HostVO> hosts =
_hostDao.listByDataCenterIdAndHypervisorType(zoneId, HypervisorType.XenServer);
+
+ if (hosts == null) {
+ return null;
+ }
+
+ List<Long> clustersToSkip = new ArrayList<>();
+
+ Collections.shuffle(hosts, random);
+
+ for (HostVO host : hosts) {
+ if (computeClusterMustSupportResign) {
+ long clusterId = host.getClusterId();
+
+ if (clustersToSkip.contains(clusterId)) {
+ continue;
+ }
+
+ if (_clusterDao.computeClusterSupportsResign(clusterId)) {
+ return host;
+ }
+ else {
+ clustersToSkip.add(clusterId);
}
}
+ else {
+ return host;
+ }
}
- throw new CloudRuntimeException("Unable to locate an applicable
cluster");
+ return null;
}
@Override
public void copyAsync(Map<VolumeInfo, DataStore> volumeMap,
VirtualMachineTO vmTo, Host srcHost, Host destHost,
AsyncCompletionCallback<CopyCommandResult> callback) {
CopyCommandResult result = new CopyCommandResult(null, null);
+
result.setResult("Unsupported operation requested for copying
data.");
+
callback.complete(result);
}
+
+ private Map<String, String> getDetails(DataObject dataObj) {
+ if (dataObj instanceof VolumeInfo) {
+ return getVolumeDetails((VolumeInfo)dataObj);
+ }
+ else if (dataObj instanceof SnapshotInfo) {
+ return getSnapshotDetails((SnapshotInfo)dataObj);
+ }
+
+ throw new CloudRuntimeException("'dataObj' must be of type
'VolumeInfo' or 'SnapshotInfo'.");
+ }
+
+ private CopyCmdAnswer performResignature(DataObject dataObj, HostVO
hostVO) {
--- End diff --
performResigning seems a better name, @mike-tutkowski ???
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
