From 614af50625a8495812dce8da59db0e1aef40b1c0 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 15 Jan 2019 12:59:59 +0900
Subject: [PATCH] YARN-9179. Fix NPE in
 AbstractYarnScheduler#updateNewContainerInfo.

---
 .../scheduler/AbstractYarnScheduler.java      | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index 0ad47bb8f90..a798b97af5f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -1040,20 +1040,27 @@ private List<ContainerStatus> updateNewContainerInfo(RMNode nm,
     for (Map.Entry<ApplicationId, ContainerStatus> c : updateExistContainers) {
       SchedulerApplication<T> app = applications.get(c.getKey());
       ContainerId containerId = c.getValue().getContainerId();
-      String strExposedPorts = c.getValue().getExposedPorts();
-      Map<String, List<Map<String, String>>> exposedPorts = null;
-      if (null != strExposedPorts && !strExposedPorts.isEmpty()) {
-        Gson gson = new Gson();
-        exposedPorts = gson.fromJson(strExposedPorts,
-            new TypeToken<Map<String, List<Map<String, String>>>>()
-            {}.getType());
+      if (app == null || app.getCurrentAppAttempt() == null) {
+        continue;
       }
-
       RMContainer rmContainer
           = app.getCurrentAppAttempt().getRMContainer(containerId);
-      if (null != rmContainer &&
-          (null == rmContainer.getExposedPorts()
-              || rmContainer.getExposedPorts().size() == 0)) {
+      if (rmContainer == null) {
+        continue;
+      }
+      // exposed ports are already set for the container, skip
+      if (rmContainer.getExposedPorts() != null &&
+          rmContainer.getExposedPorts().size() > 0) {
+        continue;
+      }
+
+      String strExposedPorts = c.getValue().getExposedPorts();
+      if (null != strExposedPorts && !strExposedPorts.isEmpty()) {
+        Gson gson = new Gson();
+        Map<String, List<Map<String, String>>> exposedPorts =
+            gson.fromJson(strExposedPorts,
+            new TypeToken<Map<String, List<Map<String, String>>>>()
+                {}.getType());
         LOG.info("update exist container " + containerId.getContainerId()
             + ", strExposedPorts = " + strExposedPorts);
         rmContainer.setExposedPorts(exposedPorts);