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 2015/11/11 00:57:19 UTC
ambari git commit: AMBARI-13822. Finalize Upgrade Pre-Check is not
retryable (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b9bea5266 -> 2c273868a
AMBARI-13822. Finalize Upgrade Pre-Check is not retryable (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c273868
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c273868
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c273868
Branch: refs/heads/branch-2.1
Commit: 2c273868a0891842c984ab4d3b7017e276e22724
Parents: b9bea52
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Nov 10 18:57:09 2015 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Nov 10 18:57:09 2015 -0500
----------------------------------------------------------------------
.../serveraction/upgrades/ComponentVersionCheckAction.java | 2 +-
.../stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 1 -
.../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 1 -
.../stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 1 -
.../main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 1 -
.../main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 1 -
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 1 -
.../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 1 -
.../upgrades/ComponentVersionCheckActionTest.java | 7 +++----
9 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckAction.java
index 39175c9..7705c7d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckAction.java
@@ -66,7 +66,7 @@ public class ComponentVersionCheckAction extends FinalizeUpgradeAction {
return createCommandReport(0, HostRoleStatus.COMPLETED, "{}", outSB.toString(), errSB.toString());
} else {
String structuredOut = getErrors(outSB, errSB, errors);
- return createCommandReport(0, HostRoleStatus.HOLDING, structuredOut, outSB.toString(), errSB.toString());
+ return createCommandReport(-1, HostRoleStatus.FAILED, structuredOut, outSB.toString(), errSB.toString());
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
index 0a6461d..1a62dc4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
@@ -488,7 +488,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
index 98e7b64..9eeabe5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml
@@ -468,7 +468,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
index b8bf32a..fe698fc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml
@@ -740,7 +740,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 02ad006..ad47358 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -302,7 +302,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
index e94ddb1..efe27f1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml
@@ -344,7 +344,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index ae5747a..3f5a56c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -535,7 +535,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
index 566fe9e..5570b7a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml
@@ -345,7 +345,6 @@
</group>
<group xsi:type="cluster" name="FINALIZE_PRE_CHECK" title="Finalize {{direction.text.proper}} Pre-Check">
- <skippable>false</skippable>
<direction>UPGRADE</direction>
<execute-stage title="Check Component Versions">
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c273868/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
index ea0cf45..89f0ba6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
@@ -277,6 +277,7 @@ public class ComponentVersionCheckActionTest {
CommandReport report = action.execute(null);
assertNotNull(report);
assertEquals(HostRoleStatus.COMPLETED.name(), report.getStatus());
+ assertEquals(0, report.getExitCode());
}
@@ -350,10 +351,8 @@ public class ComponentVersionCheckActionTest {
CommandReport report = action.execute(null);
assertNotNull(report);
- assertEquals(HostRoleStatus.HOLDING.name(), report.getStatus());
-
-
-
+ assertEquals(HostRoleStatus.FAILED.name(), report.getStatus());
+ assertEquals(-1, report.getExitCode());
}
private ServiceComponentHost createNewServiceComponentHost(Cluster cluster, String svc,