Skip to content

<fix>[allocator]: reject designated cross-cluster migration when strategy is Soft #3190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zstack-robot-1 wants to merge 1 commit into from
Closed

<fix>[allocator]: reject designated cross-cluster migration when strategy is Soft #3190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions compute/src/main/java/org/zstack/compute/allocator/ResourceBindingAllocatorFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.zstack.core.componentloader.PluginRegistry;
import org.zstack.header.allocator.AbstractHostAllocatorFlow;
import org.zstack.header.allocator.AllocationScene;
import org.zstack.header.allocator.HostAllocatorConstant;
import org.zstack.header.allocator.ResourceBindingCollector;
import org.zstack.header.allocator.ResourceBindingStrategy;
import org.zstack.header.host.HostVO;
Expand Down Expand Up @@ -128,6 +129,24 @@ public void allocate() {
return;
}

// Check if user explicitly designated a target host
// If user specified a host but it's not in the bound resources, should fail regardless of strategy
String designatedHostUuid = (String) spec.getExtraData().get(HostAllocatorConstant.LocationSelector.host);
if (designatedHostUuid != null) {
// User explicitly designated a target host, but that host is not in bound resources
// This should fail even if strategy is Soft
fail(Platform.operr("designated host[uuid:%s] is not in bound resource %s, " +
"vm bindingStrategy is %s, vm bindingScene is %s, vm.ha" +
".across.clusters is %s",
designatedHostUuid, resources,
rcf.getResourceConfigValue(VmGlobalConfig.RESOURCE_BINDING_STRATEGY, spec.getVmInstance().getUuid(), String.class),
rcf.getResourceConfigValue(VmGlobalConfig.RESOURCE_BINDING_SCENE, spec.getVmInstance().getUuid(), String.class),
rcf.getResourceConfigValue(VmGlobalConfig.VM_HA_ACROSS_CLUSTERS, spec.getVmInstance().getUuid(), Boolean.class)));
return;
}

// No designated host, system is auto-allocating
// Apply Soft strategy only in this case
if (rcf.getResourceConfigValue(VmGlobalConfig.RESOURCE_BINDING_STRATEGY, spec.getVmInstance().getUuid(), String.class)
.equals(ResourceBindingStrategy.Soft.toString())) {
next(candidates);
Expand Down
Loading