Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.SSHInactivityHardTimoutSeconds name ......................................................................
core: Fix ConfigValues.SSHInactivityHardTimoutSeconds name Renames ConfigValues attribute SSHInactivityHardTimoutSeconds to SSHInactivityHardTimeoutSeconds. Change-Id: I73054c79d5c69fe188f2b3f6a5f9f936f5298ba9 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/utils/EngineSSHClient.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, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/29061/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java index 3ece55f..efd60b4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java @@ -32,7 +32,7 @@ super(); setHardTimeout( Config.<Integer>getValue( - ConfigValues.SSHInactivityHardTimoutSeconds + ConfigValues.SSHInactivityHardTimeoutSeconds ) * 1000 ); setSoftTimeout( 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 5561f7f..2126b54 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 @@ -1175,7 +1175,7 @@ @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1800") - SSHInactivityHardTimoutSeconds, + SSHInactivityHardTimeoutSeconds, @TypeConverterAttribute(String.class) @DefaultValueAttribute("virt") diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 53d598e..7277f9c 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -29,6 +29,7 @@ select fn_db_rename_config_key('SpiceReleaseCursorKeys', 'ConsoleReleaseCursorKeys', 'general'); 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'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -548,7 +549,7 @@ select fn_db_add_config_value('SPMFailOverAttempts','3','general'); select fn_db_add_config_value('SpmVCpuConsumption','1','general'); select fn_db_add_config_value('SSHInactivityTimeoutSeconds','300','general'); -select fn_db_add_config_value('SSHInactivityHardTimoutSeconds','1800','general'); +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'); @@ -1061,6 +1062,7 @@ select fn_db_delete_config_value('EnableMACAntiSpoofingFilterRules', '3.0'); 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'); ------------------------------------------------------------------------------------ -- Split config section diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index cddeb1b..e018b07 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -132,8 +132,8 @@ SpmVCpuConsumption.type=Integer SSHInactivityTimeoutSeconds.description="SSH Inactivity Timeout (in seconds)" SSHInactivityTimeoutSeconds.type=Integer -SSHInactivityHardTimoutSeconds.description="SSH Inactivity Hard Timeout (in seconds)" -SSHInactivityHardTimoutSeconds.type=Integer +SSHInactivityHardTimeoutSeconds.description="SSH Inactivity Hard Timeout (in seconds)" +SSHInactivityHardTimeoutSeconds.type=Integer NumberOfUSBSlots.description="Number of USB slots in VMs with native USB support" NumberOfUSBSlots.type=Integer NumberOfUSBSlots.validValues=0..6 -- To view, visit http://gerrit.ovirt.org/29061 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73054c79d5c69fe188f2b3f6a5f9f936f5298ba9 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
