Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.StorageDomainFalureTimeoutInMinutes name ......................................................................
core: Fix ConfigValues.StorageDomainFalureTimeoutInMinutes name Renames ConfigValues attribute StorageDomainFalureTimeoutInMinutes to StorageDomainFailureTimeoutInMinutes. Change-Id: I246341e8d030aafae6dc5d82998be6c979d9daac 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/irsbroker/IrsBrokerCommand.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql M packaging/etc/engine-config/engine-config.properties 4 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/29062/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 2126b54..a11297a 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 @@ -509,7 +509,7 @@ StoragePoolNonOperationalResetTimeoutInMin, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1") - StorageDomainFalureTimeoutInMinutes, + StorageDomainFailureTimeoutInMinutes, @TypeConverterAttribute(String.class) @DefaultValueAttribute("") ComputerADPaths, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 0e99dcf..16af602 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -1305,7 +1305,7 @@ Class[] inputType = new Class[] { Guid.class }; Object[] inputParams = new Object[] { domainId }; String jobId = SchedulerUtilQuartzImpl.getInstance().scheduleAOneTimeJob(this, "onTimer", inputType, - inputParams, Config.<Integer> getValue(ConfigValues.StorageDomainFalureTimeoutInMinutes), + inputParams, Config.<Integer> getValue(ConfigValues.StorageDomainFailureTimeoutInMinutes), TimeUnit.MINUTES); clearTimer(domainId); _timers.put(domainId, jobId); diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 7277f9c..f600dc6 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -30,6 +30,7 @@ select fn_db_rename_config_key('SpiceToggleFullScreenKeys', 'ConsoleToggleFullScreenKeys', 'general'); 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'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -552,7 +553,7 @@ select fn_db_add_config_value('SSHInactivityHardTimeoutSeconds','1800','general'); --Handling SPICE SSL Enabled select fn_db_add_config_value('SSLEnabled','true','general'); -select fn_db_add_config_value('StorageDomainFalureTimeoutInMinutes','5','general'); +select fn_db_add_config_value('StorageDomainFailureTimeoutInMinutes','5','general'); select fn_db_add_config_value('StorageDomainNameSizeLimit','50','general'); select fn_db_add_config_value('StoragePoolNameSizeLimit','40','general'); select fn_db_add_config_value('StoragePoolNonOperationalResetTimeoutInMin','3','general'); @@ -1063,6 +1064,7 @@ select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.1'); select fn_db_delete_config_value('SSHInactivityTimoutSeconds','general'); select fn_db_delete_config_value('SSHInactivityHardTimoutSeconds','general'); +select fn_db_delete_config_value('StorageDomainFalureTimeoutInMinutes','general'); ------------------------------------------------------------------------------------ -- Split config section diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index e018b07..f773c6f 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -139,8 +139,8 @@ NumberOfUSBSlots.validValues=0..6 SSLEnabled.description="SPICE SSL Enabled" SSLEnabled.validValues=true,false -StorageDomainFalureTimeoutInMinutes.description="Storage Domain failure timeout" -StorageDomainFalureTimeoutInMinutes.type=Integer +StorageDomainFailureTimeoutInMinutes.description="Storage Domain failure timeout" +StorageDomainFailureTimeoutInMinutes.type=Integer StoragePoolRefreshTimeInSeconds.description="Storage Pool Manager Polling Rate (in seconds)" StoragePoolRefreshTimeInSeconds.type=Integer SysPrep2K3Path.description="Path to a Windows 2003 machine Sys-Prep file." -- To view, visit http://gerrit.ovirt.org/29062 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I246341e8d030aafae6dc5d82998be6c979d9daac 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
