You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/11/11 20:00:05 UTC
ambari git commit: AMBARI-13841 - Check Unhealthy Hosts During
Upgrade Is No Longer Needed (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 820f5cd22 -> a1e5b2329
AMBARI-13841 - Check Unhealthy Hosts During Upgrade Is No Longer Needed (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1e5b232
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1e5b232
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1e5b232
Branch: refs/heads/trunk
Commit: a1e5b2329d1a4e0924fb3e249b02d69d82d5e234
Parents: 820f5cd
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Nov 11 11:56:20 2015 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Nov 11 13:58:05 2015 -0500
----------------------------------------------------------------------
.../apache/ambari/server/state/UpgradeContext.java | 16 ----------------
.../apache/ambari/server/state/UpgradeHelper.java | 9 +--------
.../server/state/stack/upgrade/ClusterGrouping.java | 15 ++++-----------
.../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 6 ------
.../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 6 ------
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 6 ------
.../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 6 ------
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 5 -----
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 6 ------
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 6 ------
10 files changed, 5 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 40f0bd9..bd87a55 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -232,22 +232,6 @@ public class UpgradeContext {
}
/**
- * @return a map of host to list of components.
- */
- public Map<String, List<String>> getUnhealthy() {
- Map<String, List<String>> results = new HashMap<String, List<String>>();
-
- for (ServiceComponentHost sch : m_unhealthy) {
- if (!results.containsKey(sch.getHostName())) {
- results.put(sch.getHostName(), new ArrayList<String>());
- }
- results.get(sch.getHostName()).add(sch.getServiceComponentName());
- }
-
- return results;
- }
-
- /**
* @return the service display name, or the service name if not set
*/
public String getServiceDisplay(String service) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 2b41f62..7b566d4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -150,11 +150,7 @@ public class UpgradeHelper {
/**
* The proper verbal noun of the {@link Direction} value.
*/
- DIRECTION_VERB_PROPER("direction.verb.proper"),
- /**
- * Unhealthy hosts if they are specified.
- */
- UNHEALTHY_HOSTS("hosts.unhealthy");
+ DIRECTION_VERB_PROPER("direction.verb.proper");
private String pattern;
private Placeholder(String key) {
@@ -578,9 +574,6 @@ public class UpgradeHelper {
case DIRECTION_TEXT_PROPER:
value = ctx.getDirection().getText(p == Placeholder.DIRECTION_TEXT_PROPER);
break;
- case UNHEALTHY_HOSTS:
- value = StringUtils.join(ctx.getUnhealthy().keySet(), ", ");
- break;
default:
value = m_configHelper.get().getPlaceholderValueFromDesiredConfigurations(
cluster, token);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index f710580..5e21da5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -72,6 +72,10 @@ public class ClusterGrouping extends Grouping {
@XmlAttribute(name="title")
public String title;
+ /**
+ * An optional ID which can be used to uniquely identified any execution
+ * stage.
+ */
@XmlAttribute(name="id")
public String id;
@@ -171,19 +175,8 @@ public class ClusterGrouping extends Grouping {
String service = execution.service;
String component = execution.component;
- String id = execution.id;
Task task = execution.task;
- if ( Task.Type.MANUAL == task.getType() && null != id && id.equals("unhealthy-hosts")) {
- // !!! this specific task is used ONLY when there are unhealthy
- if (ctx.getUnhealthy().isEmpty()) {
- return null;
- }
- ManualTask mt = (ManualTask) task;
-
- fillHostDetails(mt, ctx.getUnhealthy());
- }
-
Set<String> realHosts = Collections.emptySet();
if (null != service && !service.isEmpty() &&
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 3be3022..a6ff604 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
@@ -498,12 +498,6 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
-
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
<task xsi:type="manual">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 91831f7..b93bf46 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
@@ -479,12 +479,6 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
-
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
<task xsi:type="manual">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 fe698fc..24ce608 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
@@ -751,12 +751,6 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
-
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
<task xsi:type="manual">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 488c381..f0351f8 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
@@ -313,12 +313,6 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
-
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
<task xsi:type="manual">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 8ebc9a5..a8a8d89 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
@@ -352,11 +352,6 @@
<group xsi:type="cluster" name="POST_CLUSTER" title="Finalize {{direction.text.proper}}">
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 3f5a56c..f1140e0 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
@@ -546,12 +546,6 @@
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
-
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>
<task xsi:type="manual">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a1e5b232/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 2adf095..2787468 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
@@ -354,12 +354,6 @@
<group xsi:type="cluster" name="POST_CLUSTER" title="Finalize {{direction.text.proper}}">
<skippable>true</skippable>
<supports-auto-skip-failure>false</supports-auto-skip-failure>
-
- <execute-stage title="Check Unhealthy Hosts" id="unhealthy-hosts">
- <task xsi:type="manual">
- <message>The following hosts were unhealthy and should be resolved before finalizing can be completed: {{hosts.unhealthy}}</message>
- </task>
- </execute-stage>
<execute-stage title="Confirm Finalize">
<direction>UPGRADE</direction>