Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 02C151009B for ; Mon, 22 Jul 2013 05:37:44 +0000 (UTC) Received: (qmail 72420 invoked by uid 500); 22 Jul 2013 05:37:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 72308 invoked by uid 500); 22 Jul 2013 05:37:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71696 invoked by uid 99); 22 Jul 2013 05:37:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 05:37:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 52CCD8B040D; Mon, 22 Jul 2013 05:37:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Date: Mon, 22 Jul 2013 05:37:28 -0000 Message-Id: In-Reply-To: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> References: <9e4d970aa53f475ab41429fafa5de378@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [19/50] [abbrv] git commit: updated refs/heads/pvlan to ce299da CLOUDSTACK-2554: Incorrect compute of minmemory and cpu 23e54bb0 introduced multiple hypervisors support for cpu and memory overcommit. Here the HypervisorGuru base which determines the min, max range for the memory for all hypervisors computes the minCpu using the MemoryOverCommit ratio and minMemory using the CpuOverCommit ratio. Minor typo/logic issue but massive damage across all HV if enabled ;) Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85d54cd1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85d54cd1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85d54cd1 Branch: refs/heads/pvlan Commit: 85d54cd1c088997dd08f0328984bee1a55703636 Parents: 7ea2c95 Author: Prasanna Santhanam Authored: Sun May 19 16:12:31 2013 +0530 Committer: Prasanna Santhanam Committed: Sun May 19 18:34:27 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/xen/resource/CitrixResourceBase.java | 5 +---- .../cloud/hypervisor/xen/resource/XcpServerResource.java | 11 +++++++---- server/src/com/cloud/hypervisor/HypervisorGuruBase.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85d54cd1/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 78bca32..19444cc 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 @@ -3520,10 +3520,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe * @throws XenAPIException */ protected void setMemory(Connection conn, VM vm, long minMemsize, long maxMemsize) throws XmlRpcException, XenAPIException { - vm.setMemoryStaticMin(conn, mem_128m); - vm.setMemoryDynamicMin(conn, minMemsize); - vm.setMemoryDynamicMax(conn, maxMemsize); - vm.setMemoryStaticMax(conn, maxMemsize); + vm.setMemoryLimits(conn, mem_128m, maxMemsize, minMemsize, maxMemsize); } protected void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85d54cd1/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java index 7df4c46..bf0a408 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpServerResource.java @@ -140,9 +140,12 @@ public class XcpServerResource extends CitrixResourceBase { */ @Override protected void setMemory(Connection conn, VM vm, long minMemsize, long maxMemsize) throws XmlRpcException, XenAPIException { - vm.setMemoryStaticMin(conn, mem_32m); - vm.setMemoryDynamicMin(conn, minMemsize); - vm.setMemoryDynamicMax(conn, maxMemsize); - vm.setMemoryStaticMax(conn, maxMemsize); + //setMemoryLimits(staticMin, staticMax, dynamicMin, dynamicMax) + if (s_logger.isDebugEnabled()) { + s_logger.debug("Memory Limits for VM [" + vm.getNameLabel(conn) + + "[staticMin:" + mem_32m + ", staticMax:" + maxMemsize + + ", dynamicMin: " + minMemsize + ", dynamicMax:" + maxMemsize+"]]"); + } + vm.setMemoryLimits(conn, mem_32m, maxMemsize, minMemsize, maxMemsize); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85d54cd1/server/src/com/cloud/hypervisor/HypervisorGuruBase.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java index ca1644a..ea4fcc1 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java @@ -86,9 +86,9 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis ServiceOffering offering = vmProfile.getServiceOffering(); VirtualMachine vm = vmProfile.getVirtualMachine(); - Long minMemory = (long) (offering.getRamSize()/vmProfile.getCpuOvercommitRatio()); - int minspeed= (int)(offering.getSpeed()/vmProfile.getMemoryOvercommitRatio()); - int maxspeed = (offering.getSpeed()); + Long minMemory = (long) (offering.getRamSize() / vmProfile.getMemoryOvercommitRatio()); + int minspeed = (int) (offering.getSpeed() / vmProfile.getCpuOvercommitRatio()); + int maxspeed = (offering.getSpeed()); VirtualMachineTO to = new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), minspeed, maxspeed, minMemory * 1024l * 1024l, offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.limitCpuUse(), vm.getVncPassword()); to.setBootArgs(vmProfile.getBootArgs());