Revert "xen/xcpng: revert java changes in PR apache#4672"

weizhouapache · weizhouapache · commit d5ab29772014 · 2023-08-28T09:06:46.000+02:00
This reverts commit a83b902.
diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/XenServerGuru.java
@@ -17,6 +17,7 @@
 package com.cloud.hypervisor;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
@@ -95,7 +96,14 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
         if (userVmVO != null) {
             HostVO host = hostDao.findById(userVmVO.getHostId());
             if (host != null) {
-                to.setVcpuMaxLimit(MaxNumberOfVCPUSPerVM.valueIn(host.getClusterId()));
+                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);
             }
         }
 
