From 547487c135b59146bee5bb9175c050f6062e5a96 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Tue, 16 Sep 2014 20:34:16 -0700 Subject: [PATCH] Provide default values for null application report entries --- .../scala/org/apache/spark/deploy/yarn/ClientBase.scala | 6 ++++-- 1 file changed, 4 insertions(+), 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 index 8dbf6dc6a4819..64a90badaa1d9 100644 --- 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" +