HOTFIX-750. Fixes for EU on PayPal so that hdp-select set all is batched correctly (alejandro)
Change-Id: I960a60358dd87ce4b4bc79027e59697f456649ed Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9d50199 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9d50199 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9d50199 Branch: refs/heads/AMBARI-2.4.2.16 Commit: a9d501997af371208dcda32b6c5ee0f97f1856db Parents: ed301a3 Author: Alejandro Fernandez <afernan...@hortonworks.com> Authored: Thu Mar 23 10:19:42 2017 -0700 Committer: Alejandro Fernandez <afernan...@hortonworks.com> Committed: Thu Mar 23 10:26:35 2017 -0700 ---------------------------------------------------------------------- .../server/state/stack/upgrade/ClusterGrouping.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a9d50199/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 f745266..79d8ac8 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 @@ -153,18 +153,21 @@ public class ClusterGrouping extends Grouping { Task task = execution.task; - StageWrapper wrapper = null; - switch (task.getType()) { case MANUAL: case SERVER_ACTION: case CONFIGURE: - wrapper = getServerActionStageWrapper(upgradeContext, execution); + StageWrapper wrapper = getServerActionStageWrapper(upgradeContext, execution); + if (null != wrapper) { + results.add(wrapper); + } break; case EXECUTE: List<StageWrapper> wrappers = getExecuteStageWrapper(upgradeContext, execution); - results.addAll(wrappers); + if (null != wrappers) { + results.addAll(wrappers); + } break; default:
