Greg Padgett has uploaded a new change for review. Change subject: [WIP] core, db: add config values for Live Merge feature ......................................................................
[WIP] core, db: add config values for Live Merge feature Change-Id: I663690c7a11505aa5be2fbab14f49532e4bd3e12 Bug-Url: https://bugzilla.redhat.com/1058160 Signed-off-by: Greg Padgett <gpadg...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.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 packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 4 files changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/27751/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java index 69f85f1..2dcc267 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java @@ -330,4 +330,13 @@ public static boolean bootMenu(Version version) { return supportedInConfig(ConfigValues.BootMenuSupported, version); } + + /** + * @param version + * Compatibility version to check for. + * @return <code>true</code> if get live merge is supported for the given version. + */ + public static boolean liveMerge(Version version) { + return supportedInConfig(ConfigValues.LiveMergeSupported, version); + } } 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 c4df16a..321f5cf 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 @@ -1722,5 +1722,9 @@ @DefaultValueAttribute("0") UserSessionHardLimit, - Invalid + @TypeConverterAttribute(Boolean.class) + @DefaultValueAttribute("true") + LiveMergeSupported, + + Invalid; } 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 a240d33..f671c8f 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 @@ -124,7 +124,8 @@ SerialNumberPolicySupported(ConfigAuthType.User), IscsiMultipathingSupported, BootMenuSupported(ConfigAuthType.User), - MixedDomainTypesInDataCenter; + MixedDomainTypesInDataCenter, + LiveMergeSupported(ConfigAuthType.User); public static enum ConfigAuthType { Admin, diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql index 0f2353f..f6a41d0 100644 --- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -364,6 +364,11 @@ select fn_db_add_config_value('LeaseRetries','3','general'); select fn_db_add_config_value('LeaseTimeSec','60','general'); select fn_db_add_config_value('LicenseCertificateFingerPrint','5f 38 41 89 b1 33 49 0c 24 13 6b b3 e5 ba 9e c7 fd 83 80 3b','general'); +select fn_db_add_config_value('LiveMergeSupported','false','3.0'); +select fn_db_add_config_value('LiveMergeSupported','false','3.1'); +select fn_db_add_config_value('LiveMergeSupported','false','3.2'); +select fn_db_add_config_value('LiveMergeSupported','false','3.3'); +select fn_db_add_config_value('LiveMergeSupported','false','3.4'); select fn_db_add_config_value('LiveSnapshotEnabled','false','3.0'); select fn_db_add_config_value('LocalAdminPassword','123456','general'); --Handling Enable lock policy for Storage Pool Manager on activation -- To view, visit http://gerrit.ovirt.org/27751 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I663690c7a11505aa5be2fbab14f49532e4bd3e12 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadg...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
