Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.UknownTaskPrePollingLapse name ......................................................................
core: Fix ConfigValues.UknownTaskPrePollingLapse name Renames ConfigValues attribute UknownTaskPrePollingLapse to UnknownTaskPrePollingLapse. Change-Id: I4cc27adb41d31a11a8c365934e730826552a29b8 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/tasks/SPMAsyncTask.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 3 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/29065/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java index 4f5bcce..8a48cfd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java @@ -1,6 +1,6 @@ package org.ovirt.engine.core.bll.tasks; -import static org.ovirt.engine.core.common.config.ConfigValues.UknownTaskPrePollingLapse; +import static org.ovirt.engine.core.common.config.ConfigValues.UnknownTaskPrePollingLapse; import java.util.Map; @@ -135,7 +135,7 @@ * AsyncTaskManager and CommandBase. * @TODO remove this and re-factor {@link org.ovirt.engine.core.bll.tasks.AsyncTaskManager} * @return true when the time passed after creating the task is bigger than - * <code>ConfigValues.UknownTaskPrePollingLapse</code> + * <code>ConfigValues.UnknownTaskPrePollingLapse</code> * @see org.ovirt.engine.core.bll.tasks.AsyncTaskManager * @see org.ovirt.engine.core.bll.CommandBase * @since 3.0 @@ -143,7 +143,7 @@ boolean isTaskOverPrePollingLapse() { AsyncTaskParameters parameters = getParameters(); long taskStartTime = parameters.getDbAsyncTask().getStartTime().getTime(); - Integer prePollingPeriod = Config.<Integer> getValue(UknownTaskPrePollingLapse); + Integer prePollingPeriod = Config.<Integer> getValue(UnknownTaskPrePollingLapse); boolean idlePeriodPassed = System.currentTimeMillis() - taskStartTime > prePollingPeriod; 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 a1f2947..99ea635 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 @@ -795,7 +795,7 @@ @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("60000") - UknownTaskPrePollingLapse, + UnknownTaskPrePollingLapse, @TypeConverterAttribute(String.class) @DefaultValueAttribute("") diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 2541a85..2c391e1 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -33,6 +33,7 @@ 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'); +select fn_db_rename_config_key('UknownTaskPrePollingLapse', 'UnknownTaskPrePollingLapse', 'general'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -592,7 +593,7 @@ --Handling Use Secure Connection with Hosts select fn_db_add_config_value('EncryptHostCommunication','true','general'); select fn_db_add_config_value('TimeToReduceFailedRunOnVdsInMinutes','30','general'); -select fn_db_add_config_value('UknownTaskPrePollingLapse','60000','general'); +select fn_db_add_config_value('UnknownTaskPrePollingLapse','60000','general'); select fn_db_add_config_value('UserSessionHardLimit','600','general'); select fn_db_add_config_value('UserDefinedVMProperties','','3.0'); select fn_db_add_config_value('UserDefinedVMProperties','','3.1'); @@ -1069,6 +1070,7 @@ select fn_db_delete_config_value('StorageDomainFalureTimeoutInMinutes','general'); select fn_db_delete_config_value('VdsLoadBalancingeIntervalInMinutes','general'); select fn_db_delete_config_value('VdsRecoveryTimeoutInMintues','general'); +select fn_db_delete_config_value('UknownTaskPrePollingLapse','general'); ------------------------------------------------------------------------------------ -- Split config section -- To view, visit http://gerrit.ovirt.org/29065 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cc27adb41d31a11a8c365934e730826552a29b8 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
