|
59 | 59 | import com.cloud.storage.GuestOSVO;
|
60 | 60 | import com.cloud.storage.Snapshot;
|
61 | 61 | import com.cloud.storage.SnapshotVO;
|
62 |
| -import com.cloud.storage.Storage; |
63 | 62 | import com.cloud.storage.VolumeApiService;
|
64 | 63 | import com.cloud.storage.VolumeVO;
|
65 | 64 | import com.cloud.storage.dao.SnapshotDao;
|
@@ -360,10 +359,6 @@ public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
|
360 | 359 |
|
361 | 360 | @Override
|
362 | 361 | public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
|
363 |
| - //This check could be removed when PR #5297 is merged |
364 |
| - if (vmHasNFSOrLocalVolumes(vmId)) { |
365 |
| - return StrategyPriority.CANT_HANDLE; |
366 |
| - } |
367 | 362 | if (SnapshotManager.VmStorageSnapshotKvm.value() && !snapshotMemory) {
|
368 | 363 | UserVmVO vm = userVmDao.findById(vmId);
|
369 | 364 | if (vm.getState() == VirtualMachine.State.Running) {
|
@@ -465,17 +460,4 @@ protected CreateSnapshotPayload setPayload(VolumeInfo vol, SnapshotVO snapshotCr
|
465 | 460 | payload.setQuiescevm(false);
|
466 | 461 | return payload;
|
467 | 462 | }
|
468 |
| - |
469 |
| - private boolean vmHasNFSOrLocalVolumes(long vmId) { |
470 |
| - List<VolumeObjectTO> volumeTOs = vmSnapshotHelper.getVolumeTOList(vmId); |
471 |
| - |
472 |
| - for (VolumeObjectTO volumeTO : volumeTOs) { |
473 |
| - Long poolId = volumeTO.getPoolId(); |
474 |
| - Storage.StoragePoolType poolType = vmSnapshotHelper.getStoragePoolType(poolId); |
475 |
| - if (poolType == Storage.StoragePoolType.NetworkFilesystem || poolType == Storage.StoragePoolType.Filesystem) { |
476 |
| - return true; |
477 |
| - } |
478 |
| - } |
479 |
| - return false; |
480 |
| - } |
481 | 463 | }
|
0 commit comments