YARN-9984. FSPreemptionThread can cause NullPointerException while app is unregistered with containers running on a node. Contributed by Wilfred Spiegelenburg.

(cherry picked from commit 215f2052fc)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSPreemptionThread.java

@@ -141,9 +141,13 @@ class FSPreemptionThread extends Thread {
             for (RMContainer container : containers) {
               FSAppAttempt app = scheduler.getSchedulerApp(
                       container.getApplicationAttemptId());
-              LOG.info("Preempting container " + container +
+              LOG.info("Preempting container " + container + " from queue: "
-                      " from queue " + app.getQueueName());
+                  + (app != null ? app.getQueueName() : "unknown"));
-              app.trackContainerForPreemption(container);
+              // If the app has unregistered while building the container list
+              // the app might be null, skip notifying the app
+              if (app != null) {
+                app.trackContainerForPreemption(container);
+              }
             }
           }
         }
@@ -205,6 +209,13 @@ class FSPreemptionThread extends Thread {
     for (RMContainer container : containersToCheck) {
       FSAppAttempt app =
           scheduler.getSchedulerApp(container.getApplicationAttemptId());
+      // If the app has unregistered while building the container list the app
+      // might be null, just skip this container: it should be cleaned up soon
+      if (app == null) {
+        LOG.info("Found container " + container + " on node "
+            + node.getNodeName() + "without app, skipping preemption");
+        continue;
+      }
       ApplicationId appId = app.getApplicationId();
 
       if (app.canContainerBePreempted(container,