You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/11/04 11:23:41 UTC
ambari git commit: AMBARI-22320. Some pre-upgrade checks do not work
when upgrading from IOP to HDP-2.6.3 (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 069a4d4ce -> 59d6f98d3
AMBARI-22320. Some pre-upgrade checks do not work when upgrading from IOP to HDP-2.6.3 (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59d6f98d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59d6f98d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59d6f98d
Branch: refs/heads/branch-2.6
Commit: 59d6f98d385ce859e1584a30935ee77dc6951341
Parents: 069a4d4
Author: Nate Cole <nc...@hortonworks.com>
Authored: Thu Oct 26 15:12:02 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Nov 3 16:20:49 2017 -0400
----------------------------------------------------------------------
.../server/state/repository/VersionDefinitionXml.java | 10 +++++++---
.../server/state/repository/VersionDefinitionTest.java | 8 ++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d6f98d/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
index d513815..e5a19c0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
@@ -320,10 +320,14 @@ public class VersionDefinitionXml {
summary.setVersions(manifest.version, summaryReleaseVersion);
- // !!! installed service already meets the release version, then nothing to upgrade
- // !!! TODO should this be using the release compatible-with field?
- if (VersionUtils.compareVersionsWithBuild(versionToCompare, serviceVersion, 4) > 0) {
+ if (RepositoryType.STANDARD == release.repositoryType) {
summary.setUpgrade(true);
+ } else {
+ // !!! installed service already meets the release version, then nothing to upgrade
+ // !!! TODO should this be using the release compatible-with field?
+ if (VersionUtils.compareVersionsWithBuild(versionToCompare, serviceVersion, 4) > 0) {
+ summary.setUpgrade(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/59d6f98d/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
index 370a14f..6f33c7e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.lang.reflect.Field;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -425,6 +426,13 @@ public class VersionDefinitionTest {
summary = xml.getClusterSummary(cluster);
assertEquals(0, summary.getAvailableServiceNames().size());
+ f = new File("src/test/resources/version_definition_test_maint.xml");
+ xml = VersionDefinitionXml.load(f.toURI().toURL());
+ xml.release.repositoryType = RepositoryType.STANDARD;
+ xml.availableServices = Collections.emptyList();
+ summary = xml.getClusterSummary(cluster);
+ assertEquals(2, summary.getAvailableServiceNames().size());
+
f = new File("src/test/resources/version_definition_test_maint_partial.xml");
xml = VersionDefinitionXml.load(f.toURI().toURL());
summary = xml.getClusterSummary(cluster);