Skip to content

<fix>[zns]: ZCF-3728 propagate vm system tags #4017

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

Open
ZStack-Robot wants to merge 2 commits into
base: 5.5.22
Choose a base branch
from
+12 −2
Open

<fix>[zns]: ZCF-3728 propagate vm system tags #4017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dcf85f
<fix>[zns]: propagate vm system tags
May 19, 2026
dd5088c
<fix>[vmware]: stabilize VmwareTest host sync
ruansteve May 19, 2026
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
8 changes: 6 additions & 2 deletions compute/src/main/java/org/zstack/compute/allocator/HostAllocatorManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,15 @@ public String call(HostUsedCpuMem arg) {
}
});

hostUuids.stream().filter(huuid -> !hostHasVms.contains(huuid)).forEach(huuid -> {
for (String huuid : hostUuids) {
if (hostHasVms.contains(huuid)) {
continue;
}

HostUsedCpuMem s = new HostUsedCpuMem();
s.hostUuid = huuid;
hostUsedCpuMemList.add(s);
});
}

for (final HostUsedCpuMem s : hostUsedCpuMemList) {
new HostCapacityUpdater(s.hostUuid).run(new HostCapacityUpdaterRunnable() {
Expand Down
4 changes: 4 additions & 0 deletions compute/src/main/java/org/zstack/compute/vm/VmAllocateHostFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.zstack.header.host.HostVO;
import org.zstack.header.image.ImageConstant.ImageMediaType;
import org.zstack.header.image.ImageInventory;
import org.zstack.header.message.APIMessage;
import org.zstack.header.message.MessageReply;
import org.zstack.header.network.l3.L3NetworkInventory;
import org.zstack.header.storage.primary.PrimaryStorageClusterRefVO;
Expand Down Expand Up @@ -95,6 +96,9 @@ public String call(L3NetworkInventory arg) {
}));
msg.setImage(image);
msg.setVmOperation(spec.getCurrentVmOperation().toString());
if (spec.getMessage() instanceof APIMessage && ((APIMessage) spec.getMessage()).getSystemTags() != null) {
msg.setSystemTags(new ArrayList<>(((APIMessage) spec.getMessage()).getSystemTags()));
}

if (spec.getVmInventory().getZoneUuid() != null) {
msg.setZoneUuid(spec.getVmInventory().getZoneUuid());
Expand Down
2 changes: 2 additions & 0 deletions plugin/kvm/src/main/java/org/zstack/kvm/KVMHostCapacityExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.zstack.resourceconfig.ResourceConfigFacade;

import java.util.Map;
import java.util.concurrent.TimeUnit;

public class KVMHostCapacityExtension implements KVMHostConnectExtensionPoint, HostConnectionReestablishExtensionPoint {

Expand All @@ -31,6 +32,7 @@ public class KVMHostCapacityExtension implements KVMHostConnectExtensionPoint, H
public void reportCapacity(HostInventory host, Completion completion) {
CheckHostCapacityMsg msg = new CheckHostCapacityMsg();
msg.setHostUuid(host.getUuid());
msg.setTimeout(TimeUnit.MINUTES.toMillis(30));
bus.makeTargetServiceIdByResourceUuid(msg, HostConstant.SERVICE_ID, host.getUuid());
bus.send(msg, new CloudBusCallBack(completion) {
@Override
Expand Down