Catch NPEs in RMContainerAllocator#handleJobPriorityChange for compat…

…ibility with older clusters
palantir · Jul 28, 2020 · 37d2816 · 37d2816
1 parent 3413ab5
commit 37d2816
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java b/...-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java
@@ -1001,11 +1001,17 @@ private void handleUpdatedNodes(AllocateResponse response) {
   }
 
   private void handleJobPriorityChange(AllocateResponse response) {
-    Priority priorityFromResponse = Priority.newInstance(response
-        .getApplicationPriority().getPriority());
+    Priority priority = Priority.newInstance(0);
+    try {
+      priority = Priority.newInstance(response
+              .getApplicationPriority().getPriority());
+    } catch (Exception e) {
+      // palantir-hadoop only: ignore NPEs for compatibility with older clusters, along with
+      // any other exceptions to reduce iteration cycles
+    }
 
     // Update the job priority to Job directly.
-    getJob().setJobPriority(priorityFromResponse);
+    getJob().setJobPriority(priority);
   }
 
   @Private

diff --git a/palantir/CHANGELOG.md b/palantir/CHANGELOG.md
@@ -34,6 +34,7 @@ Based on Apache Hadoop tag `release-2.9.2-RC0`.
 * Manual backport of [HADOOP-15938](https://issues.apache.org/jira/browse/HADOOP-15938)
 * Comment out s3guard quantile creation in S3AInstrumentation as more aggressive version of [HADOOP-16278](https://issues.apache.org/jira/browse/HADOOP-16278)
 * Use wildfly-openssl in Azure Blob Store connector
+* Catch NPEs in RMContainerAllocator#handleJobPriorityChange for compatibility with older clusters
 
 # 2.9.2-palantir.9