From a5bcfa131e1d55fe132998184e8cf079df4f7472 Mon Sep 17 00:00:00 2001
From: Devaraj K <devaraj@apache.org>
Date: Fri, 25 Jan 2019 23:08:01 -0800
Subject: [PATCH] [SPARK-26737][YARN] Executor/Task STDERR & STDOUT log urls
 are not correct in Yarn deployment mode

---
 .../scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
index 77ce2f65245a..153fdd046145 100644
--- a/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
+++ b/resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
@@ -243,7 +243,7 @@ private[yarn] class ExecutorRunnable(
 
     // Add log urls
     container.foreach { c =>
-      sys.env.filterKeys(_.endsWith("USER")).foreach { user =>
+      sys.env.get("SPARK_USER").orElse(sys.env.get("USER")).foreach { user =>
         val containerId = ConverterUtils.toString(c.getId)
         val address = c.getNodeHttpAddress
         val baseUrl = s"$httpScheme$address/node/containerlogs/$containerId/$user"