Provide default values for null application report entries

apache · Sep 17, 2014 · 547487c · 547487c
1 parent a0ad1e9
commit 547487c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -429,10 +429,12 @@ private[spark] trait ClientBase extends Logging {
 
       if (logApplicationReport) {
         logInfo(s"Application report from ResourceManager for app ${appId.getId} (state: $state)")
+        val clientToken = Option(getClientToken(report)).getOrElse("N/A")
+        val appDiagnostics = Option(report.getDiagnostics).getOrElse("N/A")
         val details = "\n" +
           s"\t full application identifier: $appId\n" +
-          s"\t clientToken: ${getClientToken(report)}\n" +
-          s"\t appDiagnostics: ${report.getDiagnostics}\n" +
+          s"\t clientToken: $clientToken\n" +
+          s"\t appDiagnostics: $appDiagnostics\n" +
           s"\t appMasterHost: ${report.getHost}\n" +
           s"\t appQueue: ${report.getQueue}\n" +
           s"\t appMasterRpcPort: ${report.getRpcPort}\n" +