Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.VdsRecoveryTimeoutInMintues name ......................................................................
core: Fix ConfigValues.VdsRecoveryTimeoutInMintues name Renames ConfigValues attribute VdsRecoveryTimeoutInMintues to VdsRecoveryTimeoutInMinutes. Change-Id: I6e06fbf0b6020e0cb7db645cba7877135d31cc1d Bug-Url: https://bugzilla.redhat.com/1112036 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 5 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/29064/1 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 930b00a..a1f2947 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 @@ -378,7 +378,7 @@ @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("3") - VdsRecoveryTimeoutInMintues, + VdsRecoveryTimeoutInMinutes, @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("8192") diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java index 804e6af..a4e7578 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java @@ -335,7 +335,7 @@ _vds.getId(), _vds.getName(), ex.getMessage()); - final int VDS_RECOVERY_TIMEOUT_IN_MINUTES = Config.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMintues); + final int VDS_RECOVERY_TIMEOUT_IN_MINUTES = Config.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMinutes); String jobId = SchedulerUtilQuartzImpl.getInstance().scheduleAOneTimeJob(this, "onTimerHandleVdsRecovering", new Class[0], new Object[0], VDS_RECOVERY_TIMEOUT_IN_MINUTES, TimeUnit.MINUTES); recoveringJobIdMap.put(_vds.getId(), jobId); diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java index d03f617..a34ca32 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VdsManagerTest.java @@ -72,7 +72,7 @@ // // when(mockConfigUtils.<Integer> getValue(ConfigValues.VdsRefreshRate, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); // when(mockConfigUtils.<Integer> getValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); -// when(mockConfigUtils.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMintues, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); +// when(mockConfigUtils.<Integer> getValue(ConfigValues.VdsRecoveryTimeoutInMinutes, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); // when(mockConfigUtils.<Integer> getValue(ConfigValues.NumberVmRefreshesBeforeSave, ConfigCommon.defaultConfigurationVersion)).thenReturn(1); // when(mockConfigUtils.<Integer> getValue(ConfigValues.vdsTimeout, ConfigCommon.defaultConfigurationVersion)).thenReturn(60); // when(mockConfigUtils.<Boolean> getValue(ConfigValues.EncryptHostCommunication, ConfigCommon.defaultConfigurationVersion)).thenReturn(false); diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 986ca24..2541a85 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -32,6 +32,7 @@ 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'); +select fn_db_rename_config_key('VdsRecoveryTimeoutInMintues', 'VdsRecoveryTimeoutInMinutes', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -628,7 +629,7 @@ 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'); +select fn_db_add_config_value('VdsRecoveryTimeoutInMinutes','3','general'); select fn_db_add_config_value('VdsRefreshRate','2','general'); select fn_db_add_config_value('vdsRetries','0','general'); --Handling Host Selection Algorithm default for cluster @@ -1067,6 +1068,7 @@ select fn_db_delete_config_value('SSHInactivityHardTimoutSeconds','general'); select fn_db_delete_config_value('StorageDomainFalureTimeoutInMinutes','general'); select fn_db_delete_config_value('VdsLoadBalancingeIntervalInMinutes','general'); +select fn_db_delete_config_value('VdsRecoveryTimeoutInMintues','general'); ------------------------------------------------------------------------------------ -- Split config section diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index 389f853..3cf663d 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -176,8 +176,8 @@ VDSAttemptsToResetCount.type=Integer VdsLoadBalancingIntervalInMinutes.description="Host Load Balancing Interval (in minutes)" VdsLoadBalancingIntervalInMinutes.type=Integer -VdsRecoveryTimeoutInMintues.description="Host Timeout when Recovering (in minutes)" -VdsRecoveryTimeoutInMintues.type=Integer +VdsRecoveryTimeoutInMinutes.description="Host Timeout when Recovering (in minutes)" +VdsRecoveryTimeoutInMinutes.type=Integer VdsRefreshRate.alternateKey=Refresh vds rate,vds_refresh_rate, vds_refresh_rate_in_seconds VdsRefreshRate.description="Time interval in seconds to poll a Host status" VdsRefreshRate.type=Integer -- To view, visit http://gerrit.ovirt.org/29064 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e06fbf0b6020e0cb7db645cba7877135d31cc1d 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
