weizhouapache commented on code in PR #14007:
URL: https://github.com/apache/cloudstack/pull/14007#discussion_r3959545821
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java:
##########
@@ -340,38 +341,68 @@ private boolean
replaceBlockDeviceWithBackup(KVMStoragePoolManager storagePoolMg
private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr,
String vmName, PrimaryDataStoreTO volumePool, String volumePath) {
String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
+ if (Storage.StoragePoolType.RBD.equals(volumePool.getPoolType())) {
+ return attachRbdVolumeToVm(storagePoolMgr, vmName, volumePool,
volumePath, deviceToAttachDiskTo);
+ }
List<String> virshCmd = new ArrayList<>();
virshCmd.add(Script.getExecutableAbsolutePath("virsh"));
- if (volumePool.getPoolType() == Storage.StoragePoolType.RBD) {
- String xmlForRbdDisk = getXmlForRbdDisk(storagePoolMgr,
volumePool, volumePath, deviceToAttachDiskTo);
- logger.debug("RBD disk xml to attach: {}", xmlForRbdDisk);
- virshCmd.add("attach-device");
- virshCmd.add(vmName);
- virshCmd.add("/dev/stdin");
- virshCmd.add("<<EOF%sEOF");
- } else {
- virshCmd.add("attach-disk");
- virshCmd.add(vmName);
- virshCmd.add(volumePath);
- virshCmd.add(deviceToAttachDiskTo);
- if
(Storage.StoragePoolType.Linstor.equals(volumePool.getPoolType())) {
- virshCmd.add("--subdriver");
- virshCmd.add("qcow2");
- }
- virshCmd.add("--cache");
- virshCmd.add("none");
+ virshCmd.add("attach-disk");
+ virshCmd.add(vmName);
+ virshCmd.add(volumePath);
+ virshCmd.add(deviceToAttachDiskTo);
+ virshCmd.add("--driver");
+ virshCmd.add("qemu");
+ if (!Storage.StoragePoolType.Linstor.equals(volumePool.getPoolType()))
{
Review Comment:
@abh1sar
should this be
```suggestion
if
(Storage.StoragePoolType.Linstor.equals(volumePool.getPoolType())) {
```
?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
