복제기능 오류 수정(2개 이상 데이터디스크를 붙일 경우 에러), 볼륨 디바이스 id 지정 추가

Author: jschoiRR

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9864,7 +9864,7 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                         _snapshotDao.update(snapVO.getId(), snapVO);
                     }
                     VolumeVO newVol = cloneVolumeFromSnapToDB(curVmAccount, true, zoneId, diskOfferingId, provisioningType, size, minIops, maxIops, parentRootVolume, rootVolumeName,
-                                                                        _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.ROOT);
+                                                                        _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.ROOT, 0L);
                     VolumeVO rootVolume = (VolumeVO) _volumeService.cloneVolumeFromSnapshot(newVol, snapVO.getId(), curVm.getId());
                     if (rootVolume == null) {
                         throw new CloudRuntimeException("Creation of root volume is not queried. The virtual machine cannot be cloned!");
@@ -9907,16 +9907,13 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                     VolumeVO newDataDiskVol = null;
                     try {
                         newDataDiskVol = cloneVolumeFromSnapToDB(curVmAccount, true, zoneId, diskOfferingId, provisioningType, size, minIops, maxIops, parentDataDiskVolume, dataVolumeName,
-                                                                            _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.DATADISK);
+                                                                            _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.DATADISK, parentDataDiskVolume.getDeviceId());
                         VolumeVO dataDiskVolume = (VolumeVO) _volumeService.cloneVolumeFromSnapshot(newDataDiskVol, snapVO.getId(), curVm.getId());
                         if (dataDiskVolume == null) {
                             throw new CloudRuntimeException("Creation of root volume is not queried. The virtual machine cannot be cloned!");
                         }
                         createdVolumes.add(dataDiskVolume);
-
-                        for (VolumeVO createdVol : createdVolumes) {
-                            _volumeService.attachVolumeToVM(cmd.getEntityId(), createdVol.getId(), createdVol.getDeviceId(), false);
-                        }
+                        _volumeService.attachVolumeToVM(cmd.getEntityId(), dataDiskVolume.getId(), dataDiskVolume.getDeviceId(), false);
                     } catch (CloudRuntimeException e){
                         logger.warn("data disk process failed during clone, clearing the temporary resources...");
                         for (VolumeVO dataDiskToClear : createdVolumes) {
@@ -10033,7 +10030,7 @@ public UserVm createCloneVM(CloneVMCmd cmd, Long rootVolumeId) throws Concurrent
     private VolumeVO cloneVolumeFromSnapToDB(final Account owner, final Boolean displayVolume, final Long zoneId, final Long diskOfferingId,
                                                     final Storage.ProvisioningType provisioningType, final Long size, final Long minIops, final Long maxIops,
                                                     final VolumeVO parentVolume, final String volumeName, final String uuid, final Map<String, String> details,
-                                                    Volume.Type volType) {
+                                                    Volume.Type volType, final Long deviceId) {
         return Transaction.execute((TransactionCallback<VolumeVO>) status -> {
             VolumeVO volume = new VolumeVO(volumeName, -1, -1, -1, -1, Long.valueOf(-1), null, null, provisioningType, 0, volType);
             volume.setPoolId(null);
@@ -10049,9 +10046,8 @@ private VolumeVO cloneVolumeFromSnapToDB(final Account owner, final Boolean disp
             volume.setInstanceId(null);
             volume.setUpdated(new Date());
             volume.setDisplayVolume(displayVolume);
-            if (volType == Volume.Type.ROOT) {
-                volume.setDeviceId(0L);
-            }
+            volume.setDeviceId(deviceId);
+
             if (parentVolume != null) {
                 volume.setTemplateId(parentVolume.getTemplateId());
                 volume.setFormat(parentVolume.getFormat());