Ramesh N has uploaded a new change for review. Change subject: gluster : add gluster prefix to gluster storage device configs ......................................................................
gluster : add gluster prefix to gluster storage device configs Add gluster prefix to all config variables for storage device. Change-Id: I96e261ad48f404add0b700c35139df8020cb7349 Signed-off-by: Ramesh Nachimuthu <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.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/queries/ConfigurationValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 6 files changed, 14 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/39987/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java index 7641657..4f5a99a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java @@ -44,12 +44,12 @@ } private List<String> getMountPointsFilter() { - return Arrays.asList(Config.<String> getValue(ConfigValues.MountPointsToIgoreInGlusterStorageList).split(",")); + return Arrays.asList(Config.<String> getValue(ConfigValues.GlusterStorageDeviceListMountPointsToIgore).split(",")); } private List<String> getFsTypesFilter() { - return Arrays.asList(Config.<String> getValue(ConfigValues.FileSystemTypesToIgoreInGlusterStorageList) + return Arrays.asList(Config.<String> getValue(ConfigValues.GlusterStorageDeviceListFileSystemTypesToIgore) .split(",")); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java index 9235e89..831adaf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetUnusedGlusterBricksQuery.java @@ -37,7 +37,7 @@ for (StorageDevice brick : bricksFromServer) { if (brick.getMountPoint() != null && !brick.getMountPoint().isEmpty() && brick.getMountPoint() - .startsWith(Config.<String> getValue(ConfigValues.DefaultGlusterBrickMountPoint)) + .startsWith(Config.<String> getValue(ConfigValues.GlusterDefaultBrickMountPoint)) && !bricksDir.contains(brick.getMountPoint())) { freeBricks.add(brick); } 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 ad83167..7221380 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 @@ -1247,7 +1247,7 @@ @TypeConverterAttribute(String.class) @DefaultValueAttribute("/gluster-bricks") - DefaultGlusterBrickMountPoint, + GlusterDefaultBrickMountPoint, @Reloadable @TypeConverterAttribute(String.class) @@ -1460,11 +1460,11 @@ @TypeConverterAttribute(String.class) @DefaultValueAttribute("/,/home,/boot") - MountPointsToIgoreInGlusterStorageList, + GlusterStorageDeviceListMountPointsToIgore, @TypeConverterAttribute(String.class) @DefaultValueAttribute("swap") - FileSystemTypesToIgoreInGlusterStorageList, + GlusterStorageDeviceListFileSystemTypesToIgore, @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("3600") diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 0689602..446ffec 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -88,7 +88,7 @@ GlusterVolumeOptionGroupVirtValue, GlusterVolumeOptionOwnerUserVirtValue, GlusterVolumeOptionOwnerGroupVirtValue, - DefaultGlusterBrickMountPoint, + GlusterDefaultBrickMountPoint, CpuPinningEnabled, CpuPinMigrationEnabled, MigrationSupportForNativeUsb(ConfigAuthType.User), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java index 7296ba7..fc407dc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java @@ -170,7 +170,7 @@ } }; AsyncDataProvider.getInstance() - .getConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.DefaultGlusterBrickMountPoint, + .getConfigFromCache(new GetConfigurationValueParameters(ConfigurationValues.GlusterDefaultBrickMountPoint, AsyncDataProvider.getInstance().getDefaultConfigurationVersion()), asyncQueryForDefaultMountPoint); diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 55540e8..a8a64a7 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -176,9 +176,9 @@ -- Gluster Disk Provisioning -- select fn_db_add_config_value_for_versions_up_to('GlusterBrickProvisioningEnabled', 'false', '3.5'); -select fn_db_add_config_value('MountPointsToIgoreInGlusterStorageList','/,/home,/boot','general'); -select fn_db_add_config_value('FileSystemTypesToIgoreInGlusterStorageList','swap','general'); -select fn_db_add_config_value('DefaultGlusterBrickMountPoint','/gluster-bricks','general'); +select fn_db_add_config_value('GlusterStorageDeviceListMountPointsToIgore','/,/home,/boot','general'); +select fn_db_add_config_value('GlusterStorageDeviceListFileSystemTypesToIgore','swap','general'); +select fn_db_add_config_value('GlusterDefaultBrickMountPoint','/gluster-bricks','general'); -- Gluster Network Role -- select fn_db_add_config_value_for_versions_up_to('GlusterNetworkRoleSupported', 'false', '3.5'); @@ -936,6 +936,9 @@ select fn_db_delete_config_value('ProductKeyWindows8x64','general'); select fn_db_delete_config_value('ProductKeyWindows2012x64','general'); select fn_db_delete_config_value('VdsFenceOptionMapping','general'); +select fn_db_delete_config_value('MountPointsToIgoreInGlusterStorageList','general'); +select fn_db_delete_config_value('FileSystemTypesToIgoreInGlusterStorageList','general'); +select fn_db_delete_config_value('DefaultGlusterBrickMountPoint','general'); -- removing power client select fn_db_delete_config_value('PowerClientAllowUsingAsIRS','general'); select fn_db_delete_config_value('PowerClientGUI','general'); -- To view, visit https://gerrit.ovirt.org/39987 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96e261ad48f404add0b700c35139df8020cb7349 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ramesh N <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
