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 8830410C37 for ; Tue, 3 Sep 2013 11:09:52 +0000 (UTC) Received: (qmail 30929 invoked by uid 500); 3 Sep 2013 11:09:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30380 invoked by uid 500); 3 Sep 2013 11:09:20 -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 29363 invoked by uid 99); 3 Sep 2013 11:09:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Sep 2013 11:09:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0DC108BC8F8; Tue, 3 Sep 2013 11:09:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Tue, 03 Sep 2013 11:09:13 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] git commit: updated refs/heads/disk-cache to 72f2f12 CLOUDSTACK-4538: set default value of cpu.overprovisioning.factor and mem.overprovisioning.factor to 1 On a fresh environment, some values in cloud.configuration table are persisted in com.cloud.server.ConfigurationServerImpl.persistDefaultValues() A default value need to be set before com.cloud.upgrade.DatabaseUpgradeChecker Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a67750c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a67750c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a67750c Branch: refs/heads/disk-cache Commit: 1a67750cb66cf74175e2776ba3f3ba76fde0d1bb Parents: 53ee2c9 Author: Wei Zhou Authored: Thu Aug 29 12:41:18 2013 +0200 Committer: Wei Zhou Committed: Thu Aug 29 12:41:18 2013 +0200 ---------------------------------------------------------------------- .../schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a67750c/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index d578e0e..e50e792 100755 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -650,12 +650,14 @@ public class Upgrade410to420 implements DbUpgrade { pstmt3=conn.prepareStatement("select value from `cloud`.`configuration` where name=?"); pstmt3.setString(1,"cpu.overprovisioning.factor"); rscpu_global = pstmt3.executeQuery(); - rscpu_global.next(); - String global_cpu_overprovisioning_factor=rscpu_global.getString(1); + String global_cpu_overprovisioning_factor = "1"; + if (rscpu_global.next()) + global_cpu_overprovisioning_factor = rscpu_global.getString(1); pstmt3.setString(1,"mem.overprovisioning.factor"); rsmem_global = pstmt3.executeQuery(); - rsmem_global.next(); - String global_mem_overprovisioning_factor = rsmem_global.getString(1); + String global_mem_overprovisioning_factor = "1"; + if (rsmem_global.next()) + global_mem_overprovisioning_factor = rsmem_global.getString(1); rs1 = pstmt.executeQuery(); while (rs1.next()) {