From 73478e3bbe3f09d9ee5334696acca8bdb2c5437e Mon Sep 17 00:00:00 2001
From: bibinchundatt <bibinchundatt@apache.org>
Date: Tue, 9 Jan 2018 17:57:01 +0530
Subject: [PATCH] YARN-7508. NPE in FiCaSchedulerApp when debug log enabled in
 async-scheduling mode. Contributed by Tao Yang.

(cherry picked from commit b26e30ab1655a8cdf369862a5512db5c2a88ec46)
---
 .../scheduler/common/fica/FiCaSchedulerApp.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 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/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index 1d91316f74f..38b721380c9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -438,9 +438,9 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
               if (LOG.isDebugEnabled()) {
                 LOG.debug("Try to re-reserve a container, but node "
                     + schedulerContainer.getSchedulerNode()
-                    + " is already reserved by another container"
+                    + " is already reserved by another container="
                     + schedulerContainer.getSchedulerNode()
-                    .getReservedContainer().getContainerId());
+                    .getReservedContainer());
               }
               return false;
             }