DRS 기능 수정

압축/중복제거 볼륨을 사용하는 가상머신은 마이그레이션 플랜에서 제외되도록 수정

Author: qoxown12

server/src/main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java

@@ -233,12 +233,10 @@ public UserVmResponse newUserVmResponse(ResponseView view, String objectName, Us
         userVmResponse.setKvdoInUse(false);
         List<VolumeVO> volumesForVm = _volsDao.findUsableVolumesForInstance(userVm.getId());
         for (VolumeVO vol : volumesForVm) {
-            if (vol.getDiskOfferingId() != null) {
-                DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId());
-                if (diskOffering.getKvdoEnable()) {
-                    userVmResponse.setKvdoInUse(true);
-                    break;
-                }
+            DiskOfferingVO diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId());
+            if (diskOffering.getKvdoEnable()) {
+                userVmResponse.setKvdoInUse(true);
+                break;
             }
         }
         if (details.contains(VMDetails.all) || details.contains(VMDetails.backoff)) {

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -1512,12 +1512,10 @@ public Host maintain(final PrepareForHostMaintenanceCmd cmd) {
         for (VMInstanceVO vm : activeVMs) {
             List<VolumeVO> volumesForVm = volumeDao.findUsableVolumesForInstance(vm.getId());
             for (VolumeVO vol : volumesForVm) {
-                if (vol.getDiskOfferingId() != null) {
-                    DiskOfferingVO diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
-                    if (diskOffering.getKvdoEnable()) {
-                        logger.debug("The host on which maintenance mode is to be set cannot be run because there is a virtual machine using a compressed/deduplicated volume. Check the VM: " + vm.getInstanceName());
-                        throw new InvalidParameterValueException("The host on which maintenance mode is to be set cannot be run because there is a virtual machine using a compressed/deduplicated volume. Check the VM: " + vm.getInstanceName());
-                    }
+                DiskOfferingVO diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
+                if (diskOffering.getKvdoEnable()) {
+                    logger.debug("The host on which maintenance mode is to be set cannot be run because there is a virtual machine using a compressed/deduplicated volume. Check the VM: " + vm.getInstanceName());
+                    throw new InvalidParameterValueException("The host on which maintenance mode is to be set cannot be run because there is a virtual machine using a compressed/deduplicated volume. Check the VM: " + vm.getInstanceName());
                 }
             }
         }