big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-9655. AllocateResponse in FederationInterceptor lost applicationPriority. Contributed by hunshenshi.

Browse Source
This commit is contained in:
Weiwei Yang 2019-07-02 09:55:25 +08:00
parent 2f4b37b53c
commit 570eee30e5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/FederationInterceptor.java
View File

@ -1446,6 +1446,11 @@ protected void mergeAllocateResponse(AllocateResponse homeResponse,
} }
} }
if (otherResponse.getApplicationPriority() != null) {
homeResponse.setApplicationPriority(
otherResponse.getApplicationPriority());
}
homeResponse.setNumClusterNodes( homeResponse.setNumClusterNodes(
homeResponse.getNumClusterNodes() + otherResponse.getNumClusterNodes()); homeResponse.getNumClusterNodes() + otherResponse.getNumClusterNodes());

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
View File

@ -748,6 +748,7 @@ public void testAllocateResponse() throws Exception {
Assert.assertEquals(1, response.getNMTokens().size()); Assert.assertEquals(1, response.getNMTokens().size());
Assert.assertEquals(1, response.getUpdatedContainers().size()); Assert.assertEquals(1, response.getUpdatedContainers().size());
Assert.assertEquals(1, response.getUpdateErrors().size()); Assert.assertEquals(1, response.getUpdateErrors().size());
Assert.assertNotNull(response.getApplicationPriority());
} }
@Test @Test