This is an automated email from the ASF dual-hosted git repository.
wwei pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 46b81a9 YARN-9655. AllocateResponse in FederationInterceptor lost
applicationPriority. Contributed by hunshenshi.
46b81a9 is described below
commit 46b81a982b9eebd9499914db49f99fcdb127d8c2
Author: Weiwei Yang <[email protected]>
AuthorDate: Tue Jul 2 09:55:25 2019 +0800
YARN-9655. AllocateResponse in FederationInterceptor lost
applicationPriority. Contributed by hunshenshi.
(cherry picked from commit 570eee30e5ab5cf37b1a758934987cbf61140f6a)
---
.../yarn/server/nodemanager/amrmproxy/FederationInterceptor.java | 5 +++++
.../yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java | 1 +
2 files changed, 6 insertions(+)
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/FederationInterceptor.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/FederationInterceptor.java
index 9a53a50..261ff7a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/FederationInterceptor.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/FederationInterceptor.java
@@ -1292,6 +1292,11 @@ public class FederationInterceptor extends
AbstractRequestInterceptor {
}
}
+ if (otherResponse.getApplicationPriority() != null) {
+ homeResponse.setApplicationPriority(
+ otherResponse.getApplicationPriority());
+ }
+
homeResponse.setNumClusterNodes(
homeResponse.getNumClusterNodes() +
otherResponse.getNumClusterNodes());
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
index eefaba1..42238d3 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/amrmproxy/TestFederationInterceptor.java
@@ -668,6 +668,7 @@ public class TestFederationInterceptor extends
BaseAMRMProxyTest {
Assert.assertEquals(1, response.getNMTokens().size());
Assert.assertEquals(1, response.getUpdatedContainers().size());
Assert.assertEquals(1, response.getUpdateErrors().size());
+ Assert.assertNotNull(response.getApplicationPriority());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
