From 1a67750cb66cf74175e2776ba3f3ba76fde0d1bb Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 29 Aug 2013 12:41:18 +0200 Subject: [PATCH] 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 --- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index d578e0e7ef8..e50e792663e 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()) {