apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reconcile chaininfo after attaching volume

Browse Source
This commit is contained in:
Harikrishna Patnala 2020-10-06 11:31:25 +05:30
parent 9b923ba9dc
commit 388a9c2c6d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java
View File

@ -2184,6 +2184,9 @@ public class VmwareStorageProcessor implements StorageProcessor {
}
vmMo.attachDisk(new String[] { datastoreVolumePath }, morDs, diskController);
VirtualMachineDiskInfoBuilder diskInfoBuilder = vmMo.getDiskInfoBuilder();
VirtualMachineDiskInfo diskInfo = diskInfoBuilder.getDiskInfoByBackingFileBaseName(volumePath, dsMo.getName());
chainInfo = _gson.toJson(diskInfo);
if (isManaged) {
expandVirtualDisk(vmMo, datastoreVolumePath, volumeTO.getSize());
@ -2201,15 +2204,16 @@ public class VmwareStorageProcessor implements StorageProcessor {
}
if (datastoreChangeObserved) {
answer.setContextParam("datastoreName", dsMo.getCustomFieldValue(CustomFieldConstants.CLOUD_UUID));
answer.setContextParam("chainInfo", chainInfo);
}
if (volumePathChangeObserved) {
answer.setContextParam("volumePath", volumePath);
answer.setContextParam("chainInfo", chainInfo);
}
}
if (chainInfo != null && !chainInfo.isEmpty())
answer.setContextParam("chainInfo", chainInfo);
return answer;
} catch (Throwable e) {
if (e instanceof RemoteException) {

6
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -3109,7 +3109,13 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
if (volumeToAttachStoragePool.isManaged() && volumeToAttach.getPath() == null) {
volumeToAttach.setPath(answer.getDisk().getPath());
_volsDao.update(volumeToAttach.getId(), volumeToAttach);
}
String chainInfo = answer.getContextParam("chainInfo");
if (chainInfo != null) {
volumeToAttach = _volsDao.findById(volumeToAttach.getId());
volumeToAttach.setChainInfo(chainInfo);
_volsDao.update(volumeToAttach.getId(), volumeToAttach);
}
} else {