Repository: ambari Updated Branches: refs/heads/trunk 81497776e -> 10371363d
AMBARI-15696: BulkCommand stop NodeManagers stops the wrong component (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10371363 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10371363 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10371363 Branch: refs/heads/trunk Commit: 10371363d2bae1ee2c5e968afc9e94240a2ee49a Parents: 8149777 Author: Di Li <[email protected]> Authored: Thu Apr 7 09:59:05 2016 -0400 Committer: Di Li <[email protected]> Committed: Thu Apr 7 09:59:05 2016 -0400 ---------------------------------------------------------------------- .../org/apache/ambari/server/state/ComponentInfo.java | 2 +- .../resources/common-services/YARN/2.1.0.2.0/metainfo.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10371363/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java index f676dab..2205316 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java @@ -340,7 +340,7 @@ public class ComponentInfo { if (autoDeploy != null ? !autoDeploy.equals(that.autoDeploy) : that.autoDeploy != null) return false; if (cardinality != null ? !cardinality.equals(that.cardinality) : that.cardinality != null) return false; if (versionAdvertised != that.versionAdvertised) return false; - if (decommissionAllowed != that.decommissionAllowed) return false; + if (decommissionAllowed != null ? !decommissionAllowed.equals(that.decommissionAllowed) : that.decommissionAllowed != null) return false; if (category != null ? !category.equals(that.category) : that.category != null) return false; if (clientConfigFiles != null ? !clientConfigFiles.equals(that.clientConfigFiles) : that.clientConfigFiles != null) return false; http://git-wip-us.apache.org/repos/asf/ambari/blob/10371363/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml index ea52a69..1323e8d 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml @@ -90,6 +90,11 @@ <scriptType>PYTHON</scriptType> <timeout>1200</timeout> </commandScript> + <bulkCommands> + <displayName>NodeManagers</displayName> + <!-- Used by decommission and recommission --> + <masterComponent>RESOURCEMANAGER</masterComponent> + </bulkCommands> <logs> <log> <logId>yarn_nodemanager</logId> @@ -217,11 +222,6 @@ <scriptType>PYTHON</scriptType> <timeout>1200</timeout> </commandScript> - <bulkCommands> - <displayName>NodeManagers</displayName> - <!-- Used by decommission and recommission --> - <masterComponent>RESOURCEMANAGER</masterComponent> - </bulkCommands> </component> <component>
