Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-2924. Fixed RMAdminCLI to not convert node labels to lower case. Contributed by Wangda Tan 

(cherry picked from commit 437322afca)
This commit is contained in:
Jian He 2014-12-09 17:56:04 -08:00
parent 0f47e4e745
commit b31dfb17d8
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -179,6 +179,9 @@ Release 2.7.0 - UNRELEASED
YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager YARN-2930. Fixed TestRMRestart#testRMRestartRecoveringNodeLabelManager
intermittent failure. (Wangda Tan via jianhe) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RMAdminCLI.java
View File

@ -399,7 +399,7 @@ public class RMAdminCLI extends HAAdmin {
for (int i = 1; i < splits.length; i++) { for (int i = 1; i < splits.length; i++) {
if (!splits[i].trim().isEmpty()) { if (!splits[i].trim().isEmpty()) {
map.get(nodeId).add(splits[i].trim().toLowerCase()); map.get(nodeId).add(splits[i].trim());
} }
} }
} }

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestRMAdminCLI.java
View File

@ -468,9 +468,9 @@ public class TestRMAdminCLI {
@Test @Test
public void testReplaceLabelsOnNode() throws Exception { public void testReplaceLabelsOnNode() throws Exception {
// Successfully replace labels // Successfully replace labels
dummyNodeLabelsManager.addToCluserNodeLabels(ImmutableSet.of("x", "y")); dummyNodeLabelsManager.addToCluserNodeLabels(ImmutableSet.of("x", "Y"));
String[] args = String[] args =
{ "-replaceLabelsOnNode", "node1,x,y node2,y", { "-replaceLabelsOnNode", "node1,x,Y node2,Y",
"-directlyAccessNodeLabelStore" }; "-directlyAccessNodeLabelStore" };
assertEquals(0, rmAdminCLI.run(args)); assertEquals(0, rmAdminCLI.run(args));
assertTrue(dummyNodeLabelsManager.getNodeLabels().containsKey( assertTrue(dummyNodeLabelsManager.getNodeLabels().containsKey(