From 12db1ae82efb164fc41f5aead3e9517d5e8b98e3 Mon Sep 17 00:00:00 2001
From: hunshenshi <289517357@qq.com>
Date: Thu, 27 Jun 2019 20:39:31 +0800
Subject: [PATCH 1/4] YARN-9655:AllocateResponse in FederationInterceptor lost
 applicationPriority

---
 .../server/nodemanager/amrmproxy/FederationInterceptor.java   | 4 ++++
 1 file changed, 4 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 992dc823dfc7f..ebd80d56a2371 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
@@ -1446,6 +1446,10 @@ protected void mergeAllocateResponse(AllocateResponse homeResponse,
       }
     }
 
+    if (otherResponse.getApplicationPriority() != null) {
+      homeResponse.setApplicationPriority(otherResponse.getApplicationPriority());
+    }
+
     homeResponse.setNumClusterNodes(
         homeResponse.getNumClusterNodes() + otherResponse.getNumClusterNodes());
 

From 1b2fd0db8ae80b5b42a6bd95b7491a60ae59dbb4 Mon Sep 17 00:00:00 2001
From: hunshenshi <289517357@qq.com>
Date: Fri, 28 Jun 2019 10:27:09 +0800
Subject: [PATCH 2/4] YARN-9655:fix checkstyle

---
 .../server/nodemanager/amrmproxy/FederationInterceptor.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ebd80d56a2371..5d165c995843f 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
@@ -1447,7 +1447,8 @@ protected void mergeAllocateResponse(AllocateResponse homeResponse,
     }
 
     if (otherResponse.getApplicationPriority() != null) {
-      homeResponse.setApplicationPriority(otherResponse.getApplicationPriority());
+      homeResponse.setApplicationPriority(
+          otherResponse.getApplicationPriority());
     }
 
     homeResponse.setNumClusterNodes(

From c00f3fbd56999e2b3f83fa33809cfb49a01d35ae Mon Sep 17 00:00:00 2001
From: hunshenshi <289517357@qq.com>
Date: Sat, 29 Jun 2019 10:24:34 +0800
Subject: [PATCH 3/4] YARN-9655: add a UT in
 TestFederationInterceptor#testAllocateResponse

---
 .../server/nodemanager/amrmproxy/TestFederationInterceptor.java  | 1 +
 1 file changed, 1 insertion(+)

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 ecaeaae7bf97f..3288382b26de0 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
@@ -748,6 +748,7 @@ public void testAllocateResponse() throws Exception {
     Assert.assertEquals(1, response.getNMTokens().size());
     Assert.assertEquals(1, response.getUpdatedContainers().size());
     Assert.assertEquals(1, response.getUpdateErrors().size());
+    Assert.assertNotNull(response.getApplicationPriority());
   }
 
   @Test

From 8f011e5a442c20c035cbae7ce09ca0693addf17c Mon Sep 17 00:00:00 2001
From: hunshenshi <289517357@qq.com>
Date: Wed, 3 Jul 2019 10:55:34 +0800
Subject: [PATCH 4/4] YARN-9655:check the actual priority in UT for lost
 applicationPriority in FederationInterceptor

---
 .../server/nodemanager/amrmproxy/TestFederationInterceptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3288382b26de0..a9d6a2b32795c 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
@@ -748,7 +748,7 @@ public void testAllocateResponse() throws Exception {
     Assert.assertEquals(1, response.getNMTokens().size());
     Assert.assertEquals(1, response.getUpdatedContainers().size());
     Assert.assertEquals(1, response.getUpdateErrors().size());
-    Assert.assertNotNull(response.getApplicationPriority());
+    Assert.assertEquals(0, response.getApplicationPriority().getPriority());
   }
 
   @Test