Martin Peřina has uploaded a new change for review. Change subject: core: Fix ConfigValues.GlusterAysncTasksSupport name ......................................................................
core: Fix ConfigValues.GlusterAysncTasksSupport name Renames ConfigValues attribute GlusterAysncTasksSupport to GlusterAsyncTasksSupport. Change-Id: Ibb72b8bd7ab184d83fe1d6c960d03027a6162456 Bug-Url: https://bugzilla.redhat.com/1112036 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 4 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/29066/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java index 37b2980..a6aed71 100755 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java @@ -98,8 +98,8 @@ @ClassRule public static MockConfigRule mcr = new MockConfigRule( - mockConfig(ConfigValues.GlusterAysncTasksSupport, Version.v3_2.toString(), false), - mockConfig(ConfigValues.GlusterAysncTasksSupport, Version.v3_3.toString(), true), + mockConfig(ConfigValues.GlusterAsyncTasksSupport, Version.v3_2.toString(), false), + mockConfig(ConfigValues.GlusterAsyncTasksSupport, Version.v3_3.toString(), true), mockConfig(ConfigValues.DefaultMinThreadPoolSize, 10), mockConfig(ConfigValues.DefaultMaxThreadPoolSize, 20), mockConfig(ConfigValues.DefaultMaxThreadWaitQueueSize, 10), 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 99ea635..f228876 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 @@ -1374,7 +1374,7 @@ @TypeConverterAttribute(Boolean.class) @DefaultValueAttribute("true") - GlusterAysncTasksSupport, + GlusterAsyncTasksSupport, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("10") diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java index 11bb9cf..564f731 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java @@ -64,7 +64,7 @@ * <code>false</code> if it's not. */ public static boolean glusterAsyncTasks(Version version) { - return supportedInConfig(ConfigValues.GlusterAysncTasksSupport, version); + return supportedInConfig(ConfigValues.GlusterAsyncTasksSupport, version); } /** diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 2c391e1..664832b 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -34,6 +34,10 @@ 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'); +select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.0'); +select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.1'); +select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.2'); +select fn_db_rename_config_key('GlusterAysncTasksSupport', 'GlusterAsyncTasksSupport', '3.3'); ------------------------------------------------------------------------------------ -- Add configuration values section @@ -164,10 +168,10 @@ select fn_db_add_config_value('GlusterVolumeOptionOwnerUserVirtValue','36','general'); select fn_db_add_config_value('GlusterVolumeOptionOwnerGroupVirtValue','36','general'); select fn_db_add_config_value('GlusterRefreshRateTasks', '60', 'general'); -select fn_db_add_config_value('GlusterAysncTasksSupport', 'false', '3.0'); -select fn_db_add_config_value('GlusterAysncTasksSupport', 'false', '3.1'); -select fn_db_add_config_value('GlusterAysncTasksSupport', 'false', '3.2'); -select fn_db_add_config_value('GlusterAysncTasksSupport', 'false', '3.3'); +select fn_db_add_config_value('GlusterAsyncTasksSupport', 'false', '3.0'); +select fn_db_add_config_value('GlusterAsyncTasksSupport', 'false', '3.1'); +select fn_db_add_config_value('GlusterAsyncTasksSupport', 'false', '3.2'); +select fn_db_add_config_value('GlusterAsyncTasksSupport', 'false', '3.3'); select fn_db_add_config_value('GlusterPeerStatusRetries', '2', 'general'); select fn_db_add_config_value('GlusterTaskMinWaitForCleanupInMins', '10', 'general'); @@ -1071,6 +1075,7 @@ select fn_db_delete_config_value('VdsLoadBalancingeIntervalInMinutes','general'); select fn_db_delete_config_value('VdsRecoveryTimeoutInMintues','general'); select fn_db_delete_config_value('UknownTaskPrePollingLapse','general'); +select fn_db_delete_config_value('GlusterAysncTasksSupport','3.0,3.1,3.2,3.3'); ------------------------------------------------------------------------------------ -- Split config section -- To view, visit http://gerrit.ovirt.org/29066 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb72b8bd7ab184d83fe1d6c960d03027a6162456 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
