Shahar Havivi has uploaded a new change for review. Change subject: Engine: set Rhev-H upgrade version via config value (#842767) ......................................................................
Engine: set Rhev-H upgrade version via config value (#842767) https://bugzilla.redhat.com/show_bug.cgi?id=842767 Change-Id: I042ae5263d565787ea7460f1d5f59beb77acff8b Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java 6 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/7430/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index cae394d..3b6961a 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -482,6 +482,9 @@ select fn_db_add_config_value('NetworkConnectivityCheckTimeoutInSeconds','120','general'); -- AutoRecoveryConfiguration select fn_db_add_config_value('AutoRecoveryAllowedTypes','{\"storage domains\":\"false\",\"hosts\":\"false\"}','general'); +-- RhevHUpgradeVersion +select fn_db_add_config_value('RhevHUpgradeVersion','6.2.0.0','3.0'); +select fn_db_add_config_value('RhevHUpgradeVersion','6.3.0.0','3.1'); ------------------------------------------------------------------------------------ -- Update with override section diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java index cb4c310..9a5da0e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetoVirtISOsQuery.java @@ -79,8 +79,18 @@ RpmVersion isoVersion = parseIsoFileVersion(isoFileName, majorVersionStr); boolean shouldAdd = false; + String configVersion = Config.<String> GetValue(ConfigValues.RhevHUpgradeVersion, + getVdsByVdsId(getParameters().getVdsId()).getvds_group_compatibility_version() + .toString()); + if (isoVersion != null && isIsoVersionSupported(isoVersion)) { - if (vdsOsVersion != null) { + if (!StringUtils.isEmpty(configVersion)) { + RpmVersion clusterVersion = new RpmVersion(); + clusterVersion.setValue(configVersion); + if (VdsHandler.isIsoVersionCompatibleForUpgrade(clusterVersion, isoVersion)) { + shouldAdd = true; + } + } else if (vdsOsVersion != null) { if (VdsHandler.isIsoVersionCompatibleForUpgrade(vdsOsVersion, isoVersion)) { shouldAdd = true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index c20054c..42011e4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -187,7 +187,8 @@ * @return true is version matches or if a any version isn't provided, else false. */ public static boolean isIsoVersionCompatibleForUpgrade(RpmVersion ovirtOsVersion, RpmVersion isoVersion) { - return isoVersion.getMajor() == ovirtOsVersion.getMajor() + return (isoVersion.getMajor() == ovirtOsVersion.getMajor() && + ovirtOsVersion.getMinor() <= isoVersion.getMinor()) || ovirtOsVersion.getMajor() == -1 || isoVersion.getMajor() == -1; } 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 494ac71..58f2599 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 @@ -1442,6 +1442,10 @@ @DefaultValueAttribute("ovirt-engine") SSHKeyAlias(377), + @TypeConverterAttribute(String.class) + @DefaultValueAttribute("1.0.0.0") + RhevHUpgradeVersion(378), + Invalid(65535); private int intValue; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index b9cb57b..3e58638 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -695,7 +695,7 @@ getWindow().StopProgress(); } }), - null); + getEntity().getId()); } else { model.getRootPassword().setIsAvailable(true); model.getRootPassword().setIsChangable(true); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index 910dc2e..c1cd59c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -6,7 +6,7 @@ // Host alert messages (not that the <a> and </a> tags are used to indicate the // place where the link to actions should be introduced: - @DefaultMessage("A new version is available; an upgrade option will appear once the Host is moved to maintenance mode.") + @DefaultMessage("Upgrade or reinstall RHEV Hypervisor.") String hostHasUpgradeAlert(); @DefaultMessage("This host is in non responding state. Try to Activate it; If the problem persists, switch Host to Maintenance mode and try to reinstall it.") -- To view, visit http://gerrit.ovirt.org/7430 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I042ae5263d565787ea7460f1d5f59beb77acff8b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
