From 379a9df7cbc9f0f4a1631471ce180967e5a2d1ff Mon Sep 17 00:00:00 2001 From: "shan.wu" Date: Fri, 17 Jul 2026 11:08:37 +0800 Subject: [PATCH] [migration]: rename VmOperation.MigrateStorage to MigrateVolume rename VmOperation.MigrateStorage to MigrateVolume Resolves/Related: ZSTAC-75332 Change-Id: I8160ccc0810896960248b1875366559698c42219 --- .../allocator/AttachedVolumePrimaryStorageAllocatorFlow.java | 2 +- .../compute/allocator/HostPrimaryStorageAllocatorFlow.java | 2 +- .../src/main/java/org/zstack/header/vm/VmInstanceConstant.java | 2 +- .../org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java | 3 +-- .../storage/primary/local/LocalStorageAllocatorFactory.java | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/compute/src/main/java/org/zstack/compute/allocator/AttachedVolumePrimaryStorageAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/AttachedVolumePrimaryStorageAllocatorFlow.java index b999b06387e..f31541139c4 100755 --- a/compute/src/main/java/org/zstack/compute/allocator/AttachedVolumePrimaryStorageAllocatorFlow.java +++ b/compute/src/main/java/org/zstack/compute/allocator/AttachedVolumePrimaryStorageAllocatorFlow.java @@ -32,7 +32,7 @@ public class AttachedVolumePrimaryStorageAllocatorFlow extends AbstractHostAlloc public void allocate() { throwExceptionIfIAmTheFirstFlow(); - if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) { + if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateVolume.toString().equals(spec.getVmOperation())) { next(candidates); return; } diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java index 35b5c713362..2ae0b36218f 100755 --- a/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java +++ b/compute/src/main/java/org/zstack/compute/allocator/HostPrimaryStorageAllocatorFlow.java @@ -142,7 +142,7 @@ private List filterHostHavingAccessiblePrimaryStorage(List huuid private List allocateFromCandidates() { List huuids = getHostUuidsFromCandidates(); Set requiredPsUuids = spec.getRequiredPrimaryStorageUuids(); - if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) { + if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateVolume.toString().equals(spec.getVmOperation())) { huuids = filterHostHavingAccessiblePrimaryStorage(huuids, spec) .stream().map(ResourceVO::getUuid).collect(Collectors.toList()); } else { diff --git a/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java b/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java index 88ade64b874..ede4cab86cd 100755 --- a/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java +++ b/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java @@ -62,7 +62,7 @@ enum VmOperation { Reboot, Destroy, Migrate, - MigrateStorage, + MigrateVolume, AttachVolume, AttachNic, ChangeNicNetwork, diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java index 4022b7eedb9..e592a7e6904 100644 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHostAllocatorFilterExtensionPoint.java @@ -4,7 +4,6 @@ import org.zstack.header.allocator.HostAllocatorFilterExtensionPoint; import org.zstack.header.allocator.HostAllocatorSpec; import org.zstack.header.host.HostVO; -import org.zstack.header.vm.VmInstanceConstant; import org.zstack.header.vm.VmInstanceConstant.VmOperation; import org.zstack.header.vm.VmInstanceState; import org.zstack.utils.Utils; @@ -173,7 +172,7 @@ public List filterHostCandidates(List candidates, HostAllocatorS return candidates; } - if (!VmOperation.Migrate.toString().equals(spec.getVmOperation()) && !VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) { + if (!VmOperation.Migrate.toString().equals(spec.getVmOperation()) && !VmOperation.MigrateVolume.toString().equals(spec.getVmOperation())) { return candidates; } diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageAllocatorFactory.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageAllocatorFactory.java index ca3fd08dc32..0c90fd3d9bb 100755 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageAllocatorFactory.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageAllocatorFactory.java @@ -16,7 +16,6 @@ import org.zstack.header.allocator.HostAllocatorSpec; import org.zstack.header.allocator.HostAllocatorStrategyExtensionPoint; import org.zstack.header.errorcode.OperationFailureException; -import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.host.HostInventory; import org.zstack.header.host.HostVO; import org.zstack.header.storage.primary.*; @@ -109,7 +108,7 @@ public boolean stop() { public List filterHostCandidates(List candidates, HostAllocatorSpec spec) { long reservedCapacity = SizeUtils.sizeStringToBytes(PrimaryStorageGlobalConfig.RESERVED_CAPACITY.value()); - if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateStorage.toString().equals(spec.getVmOperation())) { + if (VmOperation.NewCreate.toString().equals(spec.getVmOperation()) || VmOperation.MigrateVolume.toString().equals(spec.getVmOperation())) { List huuids = getNeedCheckHostLocalStorageList(candidates, spec); if (huuids.isEmpty()) { return candidates;