AMBARI-21281 Code refactoring: rename RU_TASKS Stagewrapper type to upgrade tasks (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34b1e5f4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34b1e5f4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34b1e5f4 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 34b1e5f4bb1a3aee03cee31dfd51f57e6480b4ce Parents: 597d003 Author: Di Li <[email protected]> Authored: Tue Jun 20 08:56:23 2017 -0400 Committer: Di Li <[email protected]> Committed: Tue Jun 20 08:56:23 2017 -0400 ---------------------------------------------------------------------- .../server/controller/internal/UpgradeResourceProvider.java | 4 ++-- .../ambari/server/state/stack/upgrade/ClusterGrouping.java | 4 ++-- .../apache/ambari/server/state/stack/upgrade/ExecuteTask.java | 2 +- .../org/apache/ambari/server/state/stack/upgrade/Grouping.java | 2 +- .../apache/ambari/server/state/stack/upgrade/StageWrapper.java | 2 +- .../server/controller/internal/UpgradeResourceProviderTest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 2f6ffc1..22858dd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -176,7 +176,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider /** * The role that will be used when creating HRC's for the type - * {@link StageWrapper.Type#RU_TASKS}. + * {@link StageWrapper.Type#UPGRADE_TASKS}. */ protected static final String EXECUTE_TASK_ROLE = "ru_execute_tasks"; @@ -828,7 +828,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider makeCommandStage(context, request, effectiveRepositoryVersion, entity, wrapper, skippable, supportsAutoSkipOnFailure, allowRetry); break; - case RU_TASKS: + case UPGRADE_TASKS: makeActionStage(context, request, effectiveRepositoryVersion, entity, wrapper, skippable, supportsAutoSkipOnFailure, allowRetry); break; http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/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 8e59602..fa988c3 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 @@ -296,7 +296,7 @@ public class ClusterGrouping extends Grouping { } return new StageWrapper( - StageWrapper.Type.RU_TASKS, + StageWrapper.Type.UPGRADE_TASKS, execution.title, new TaskWrapper(service, component, realHosts, et)); } @@ -313,7 +313,7 @@ public class ClusterGrouping extends Grouping { } return new StageWrapper( - StageWrapper.Type.RU_TASKS, + StageWrapper.Type.UPGRADE_TASKS, execution.title, new TaskWrapper(service, component, hostNames, et)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java index 960a04c..11c42c2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java @@ -68,7 +68,7 @@ public class ExecuteTask extends Task { @Override public StageWrapper.Type getStageWrapperType() { - return StageWrapper.Type.RU_TASKS; + return StageWrapper.Type.UPGRADE_TASKS; } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java index 51bd168..4f278fd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java @@ -310,7 +310,7 @@ public class Grouping { type = StageWrapper.Type.SERVER_SIDE_ACTION; break; case EXECUTE: - type = StageWrapper.Type.RU_TASKS; + type = StageWrapper.Type.UPGRADE_TASKS; break; case CONFIGURE_FUNCTION: type = StageWrapper.Type.CONFIGURE; http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java index 288f98a..70589ec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/StageWrapper.java @@ -155,7 +155,7 @@ public class StageWrapper { public enum Type { SERVER_SIDE_ACTION, RESTART, - RU_TASKS, + UPGRADE_TASKS, SERVICE_CHECK, STOP, START, http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index 014ab42..583f83b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -1658,7 +1658,7 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { } /** - * Tests that commands created for {@link org.apache.ambari.server.state.stack.upgrade.StageWrapper.Type#RU_TASKS} set the + * Tests that commands created for {@link org.apache.ambari.server.state.stack.upgrade.StageWrapper.Type#UPGRADE_TASKS} set the * service and component on the {@link ExecutionCommand}. * <p/> * Without this, commands of this type would not be able to determine which
