From 39a516227ca53aad0775275e9688ccc22ffa86f4 Mon Sep 17 00:00:00 2001
From: Lin Chan <linchan@microsoft.com>
Date: Tue, 12 Jul 2016 10:37:30 -0700
Subject: [PATCH] Set max retry to 1 only for interactive sessions.

---
 .../cloudera/livy/server/interactive/InteractiveSession.scala  | 3 +++
 server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala   | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSession.scala b/server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSession.scala
index 49e9cce89..ba0e8b8d5 100644
--- a/server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSession.scala
+++ b/server/src/main/scala/com/cloudera/livy/server/interactive/InteractiveSession.scala
@@ -69,6 +69,9 @@ object InteractiveSession {
     }
 
     val create = { (s: InteractiveSession) =>
+      if (livyConf.isSparkMasterYarn) {
+        builder.conf("spark.yarn.maxAppAttempts", "1")
+      }
       SparkApp.create(s.uuid, builder, None, List(kindString), livyConf, Option(s))
     }
 
diff --git a/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala b/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala
index 547bff644..d560607db 100644
--- a/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala
+++ b/server/src/main/scala/com/cloudera/livy/utils/SparkApp.scala
@@ -70,7 +70,6 @@ object SparkApp extends Logging {
     if (livyConf.isSparkMasterYarn) {
       val appTag = uuidToAppTag(uuid)
       builder.conf("spark.yarn.tags", appTag)
-      builder.conf("spark.yarn.maxAppAttempts", "1")
 
       listener.foreach(_.startingApp())
       val process: Option[LineBufferedProcess] = {