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 (cherry picked from commit 1a67750cb66cf74175e2776ba3f3ba76fde0d1bb) (cherry picked from commit 61ebfad4493d4f3fe4ced948985e69202080654b) Signed-off-by: animesh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30c53882 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30c53882 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30c53882 Branch: refs/heads/4.2 Commit: 30c5388253db121f5557231523c23a80e72ac3b7 Parents: c0471e6 Author: Wei Zhou <[email protected]> Authored: Thu Aug 29 12:41:18 2013 +0200 Committer: animesh <[email protected]> Committed: Tue Sep 3 16:02:20 2013 -0700 ---------------------------------------------------------------------- .../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/30c53882/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 f0b459a..2e58ddd 100755 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -856,12 +856,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()) {
