You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ni...@apache.org on 2013/12/04 23:54:54 UTC
git commit: updated refs/heads/master to 71d547b
Updated Branches:
refs/heads/master 4e7487366 -> 71d547ba8
CLOUDSTACK-5352:
CPU cap calculated incorrectly for VMs on XenServer hosts. It should not be limited by the overprovisioning and should set the cap as service offering
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71d547ba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71d547ba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71d547ba
Branch: refs/heads/master
Commit: 71d547ba875c1a7d936710512464a4343c66f28b
Parents: 4e74873
Author: Nitin Mehta <ni...@citrix.com>
Authored: Wed Dec 4 14:53:28 2013 -0800
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Wed Dec 4 14:53:28 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71d547ba/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 2a5913a..5d17290 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1361,7 +1361,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
if (vmSpec.getLimitCpuUse()) {
// CPU cap is per VM, so need to assign cap based on the number of vcpus
- utilization = (int)((speed * 0.99 * vmSpec.getCpus()) / _host.speed * 100);
+ utilization = (int) ((vmSpec.getMaxSpeed() * 0.99 * vmSpec.getCpus()) / _host.speed * 100);
}
vcpuParams.put("weight", Integer.toString(cpuWeight));