Repository: hadoop Updated Branches: refs/heads/branch-2 0f47e4e74 -> b31dfb17d
YARN-2924. Fixed RMAdminCLI to not convert node labels to lower case. Contributed by Wangda Tan (cherry picked from commit 437322afcaa4b1b260501af160283c97eb589419) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b31dfb17 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b31dfb17 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b31dfb17 Branch: refs/heads/branch-2 Commit: b31dfb17d84136c1c5f31b0f00e0a62d60aec690 Parents: 0f47e4e Author: Jian He <jia...@apache.org> Authored: Tue Dec 9 17:56:04 2014 -0800 Committer: Jian He <jia...@apache.org> Committed: Tue Dec 9 17:56:41 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java | 2 +- .../java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b31dfb17/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0a38d15..fafd129 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -179,6 +179,9 @@ Release 2.7.0 - UNRELEASED YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager intermittent failure. (Wangda Tan via jianhe) + YARN-2924. Fixed RMAdminCLI to not convert node labels to lower case. + (Wangda Tan via jianhe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b31dfb17/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java index 89d87cf..c7cc4d2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java @@ -399,7 +399,7 @@ public class RMAdminCLI extends HAAdmin { for (int i = 1; i < splits.length; i++) { if (!splits[i].trim().isEmpty()) { - map.get(nodeId).add(splits[i].trim().toLowerCase()); + map.get(nodeId).add(splits[i].trim()); } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b31dfb17/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java index 6176a3e..bee114b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java @@ -468,9 +468,9 @@ public class TestRMAdminCLI { @Test public void testReplaceLabelsOnNode() throws Exception { // Successfully replace labels - dummyNodeLabelsManager.addToCluserNodeLabels(ImmutableSet.of("x", "y")); + dummyNodeLabelsManager.addToCluserNodeLabels(ImmutableSet.of("x", "Y")); String[] args = - { "-replaceLabelsOnNode", "node1,x,y node2,y", + { "-replaceLabelsOnNode", "node1,x,Y node2,Y", "-directlyAccessNodeLabelStore" }; assertEquals(0, rmAdminCLI.run(args)); assertTrue(dummyNodeLabelsManager.getNodeLabels().containsKey(
