Skip to content

xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores #7887

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

Merged
DaanHoogland merged 11 commits into from
Aug 28, 2023
Merged

xen/xcpng: set vmr.VCPUsMax to minimum of global setting and host cpu cores #7887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a83b902
xen/xcpng: revert java changes in PR #4672
weizhouapache Aug 21, 2023
f72a3de
Merge branch '4.18' into 4.18-xcpng-revert-pr4672
weizhouapache Aug 22, 2023
4c6b407
Merge branch '4.18' into 4.18-xcpng-revert-pr4672
weizhouapache Aug 25, 2023
d5ab297
Revert "xen/xcpng: revert java changes in PR #4672"
weizhouapache Aug 28, 2023
89fe6a7
xen: check hosts cpu cores intead of cpu sockets
weizhouapache Aug 28, 2023
8fa9343
Revert "xen: check hosts cpu cores intead of cpu sockets"
weizhouapache Aug 28, 2023
35b6566
Revert "Revert "xen/xcpng: revert java changes in PR #4672""
weizhouapache Aug 28, 2023
dbc0aa7
xen: set vmr.VCPUsMax to minimum of global setting and host cpu cores
weizhouapache Aug 28, 2023
9f15636
Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…
weizhouapache Aug 28, 2023
2ee9274
Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…
weizhouapache Aug 28, 2023
d72745f
Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…
weizhouapache Aug 28, 2023
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
10 changes: 1 addition & 9 deletions plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.cloud.hypervisor;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -96,14 +95,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
if (userVmVO != null) {
HostVO host = hostDao.findById(userVmVO.getHostId());
if (host != null) {
List<HostVO> clusterHosts = hostDao.listByClusterAndHypervisorType(host.getClusterId(), host.getHypervisorType());
HostVO hostWithMinSocket = clusterHosts.stream().min(Comparator.comparing(HostVO::getCpuSockets)).orElse(null);
Integer vCpus = MaxNumberOfVCPUSPerVM.valueIn(host.getClusterId());
if (hostWithMinSocket != null && hostWithMinSocket.getCpuSockets() != null &&
hostWithMinSocket.getCpuSockets() < vCpus) {
vCpus = hostWithMinSocket.getCpuSockets();
}
to.setVcpuMaxLimit(vCpus);
to.setVcpuMaxLimit(MaxNumberOfVCPUSPerVM.valueIn(host.getClusterId()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...s/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ public VM createVmFromTemplate(final Connection conn, final VirtualMachineTO vmS
vmr.VCPUsMax = (long)vmSpec.getCpus();
} else {
if (vmSpec.getVcpuMaxLimit() != null) {
vmr.VCPUsMax = (long)vmSpec.getVcpuMaxLimit();
vmr.VCPUsMax = Math.min(vmSpec.getVcpuMaxLimit(), (long) _host.getCpus());
}
}
} else {
Expand Down