Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.VdsLoadBalancingeIntervalInMinutes name ......................................................................
core: Fix ConfigValues.VdsLoadBalancingeIntervalInMinutes name Renames ConfigValues attribute VdsLoadBalancingeIntervalInMinutes to VdsLoadBalancingIntervalInMinutes. Change-Id: I11344bc6b86502460250d2c5c7648d355addb8b4 Bug-Url: https://bugzilla.redhat.com/1112036 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 4 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/29063/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java index 69d0931..6b4d481 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java @@ -776,8 +776,8 @@ "performLoadBalancing", new Class[] {}, new Object[] {}, - Config.<Integer> getValue(ConfigValues.VdsLoadBalancingeIntervalInMinutes), - Config.<Integer> getValue(ConfigValues.VdsLoadBalancingeIntervalInMinutes), + Config.<Integer> getValue(ConfigValues.VdsLoadBalancingIntervalInMinutes), + Config.<Integer> getValue(ConfigValues.VdsLoadBalancingIntervalInMinutes), TimeUnit.MINUTES); log.info("Finished scheduling to enable vds load balancer"); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index a11297a..930b00a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -420,7 +420,7 @@ EnableVdsHaReservation, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1") - VdsLoadBalancingeIntervalInMinutes, + VdsLoadBalancingIntervalInMinutes, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("5") VdsHaReservationIntervalInMinutes, diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index f600dc6..986ca24 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -31,6 +31,7 @@ select fn_db_rename_config_key('SSHInactivityTimoutSeconds', 'SSHInactivityTimeoutSeconds', 'general'); select fn_db_rename_config_key('SSHInactivityHardTimoutSeconds', 'SSHInactivityHardTimeoutSeconds', 'general'); select fn_db_rename_config_key('StorageDomainFalureTimeoutInMinutes', 'StorageDomainFailureTimeoutInMinutes', 'general'); +select fn_db_rename_config_key('VdsLoadBalancingeIntervalInMinutes', 'VdsLoadBalancingIntervalInMinutes', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -624,7 +625,7 @@ select fn_db_add_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.4'); select fn_db_add_config_value('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.5'); select fn_db_add_config_value('CustomVdsFenceType','','general'); -select fn_db_add_config_value('VdsLoadBalancingeIntervalInMinutes','1','general'); +select fn_db_add_config_value('VdsLoadBalancingIntervalInMinutes','1','general'); select fn_db_add_config_value('VdsLocalDisksCriticallyLowFreeSpace','100','general'); select fn_db_add_config_value('VdsLocalDisksLowFreeSpace','500','general'); select fn_db_add_config_value('VdsRecoveryTimeoutInMintues','3','general'); @@ -1065,6 +1066,7 @@ select fn_db_delete_config_value('SSHInactivityTimoutSeconds','general'); select fn_db_delete_config_value('SSHInactivityHardTimoutSeconds','general'); select fn_db_delete_config_value('StorageDomainFalureTimeoutInMinutes','general'); +select fn_db_delete_config_value('VdsLoadBalancingeIntervalInMinutes','general'); ------------------------------------------------------------------------------------ -- Split config section diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index f773c6f..389f853 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -174,8 +174,8 @@ VdcVersion.description="oVirt Engine Version" VDSAttemptsToResetCount.description="Number of attempts to communicate with Host before trying to reset" VDSAttemptsToResetCount.type=Integer -VdsLoadBalancingeIntervalInMinutes.description="Host Load Balancing Interval (in minutes)" -VdsLoadBalancingeIntervalInMinutes.type=Integer +VdsLoadBalancingIntervalInMinutes.description="Host Load Balancing Interval (in minutes)" +VdsLoadBalancingIntervalInMinutes.type=Integer VdsRecoveryTimeoutInMintues.description="Host Timeout when Recovering (in minutes)" VdsRecoveryTimeoutInMintues.type=Integer VdsRefreshRate.alternateKey=Refresh vds rate,vds_refresh_rate, vds_refresh_rate_in_seconds -- To view, visit http://gerrit.ovirt.org/29063 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11344bc6b86502460250d2c5c7648d355addb8b4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
