Repository: ambari Updated Branches: refs/heads/trunk da9086dca -> bc20fd1b5
AMBARI-20155. EU: Manual Step without any context after 'All Service Checks' fail (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc20fd1b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc20fd1b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc20fd1b Branch: refs/heads/trunk Commit: bc20fd1b5fd5df2bce3c7a8315d87d6fecf22f9e Parents: da9086d Author: Nate Cole <[email protected]> Authored: Thu Feb 23 16:24:00 2017 -0500 Committer: Nate Cole <[email protected]> Committed: Fri Feb 24 09:24:40 2017 -0500 ---------------------------------------------------------------------- .../server/state/stack/upgrade/StageWrapperBuilder.java | 8 +++++++- .../server/state/stack/upgrade/StageWrapperBuilderTest.java | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc20fd1b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java index cfe4a78..3cf3f8b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilder.java @@ -27,7 +27,7 @@ import org.apache.ambari.server.serveraction.upgrades.AutoSkipFailedSummaryActio import org.apache.ambari.server.stack.HostsType; import org.apache.ambari.server.state.UpgradeContext; import org.apache.ambari.server.state.stack.UpgradePack.ProcessingComponent; -import org.springframework.util.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; /** * Defines how to build stages for an Upgrade or Downgrade. @@ -40,6 +40,11 @@ public abstract class StageWrapperBuilder { private static final String AUTO_SKIPPED_TASK_SUMMARY = "Pauses the upgrade if there were failed steps that were automatically skipped."; /** + * The message to show when the upgrade is paused due to auto-skipped failures + */ + private static final String AUTO_SKIPPED_MESSAGE = "There are failures that were automatically skipped. Review the failures before continuing."; + + /** * The upgrade/downgrade grouping that the builder is for. */ protected final Grouping m_grouping; @@ -146,6 +151,7 @@ public abstract class StageWrapperBuilder { ServerActionTask skippedFailedCheck = new ServerActionTask(); skippedFailedCheck.implClass = AutoSkipFailedSummaryAction.class.getName(); skippedFailedCheck.summary = AUTO_SKIPPED_TASK_SUMMARY; + skippedFailedCheck.messages.add(AUTO_SKIPPED_MESSAGE); TaskWrapper skippedFailedTaskWrapper = new TaskWrapper(null, null, Collections.<String> emptySet(), skippedFailedCheck); http://git-wip-us.apache.org/repos/asf/ambari/blob/bc20fd1b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java index b9e27be..0eef638 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/StageWrapperBuilderTest.java @@ -127,6 +127,8 @@ public class StageWrapperBuilderTest extends EasyMockSupport { ServerActionTask task = (ServerActionTask)(skipSummaryWrapper.getTasks().get(0).getTasks().get(0)); Assert.assertEquals(AutoSkipFailedSummaryAction.class.getName(), task.implClass); + Assert.assertEquals(1, task.messages.size()); + Assert.assertTrue(task.messages.get(0).contains("There are failures that were automatically skipped")); verifyAll(); }
