Browse Source

[livy] Fix LIVY_REPL_JAVA_OPTS for yarn mode

Erick Tryzelaar 10 years ago
parent
commit
7289799f5c

+ 8 - 0
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/InteractiveSessionFactory.scala

@@ -80,6 +80,14 @@ abstract class InteractiveSessionFactory(processFactory: SparkProcessBuilderFact
       case _ =>
       case _ =>
     }
     }
 
 
+    sys.env.get("LIVY_REPL_JAVA_OPTS").foreach { replJavaOpts =>
+      val javaOpts = builder.conf(SparkDriverExtraJavaOptions) match {
+        case Some(javaOptions) => f"$javaOptions $replJavaOpts"
+        case None => replJavaOpts
+      }
+      builder.conf(SparkDriverExtraJavaOptions, javaOpts)
+    }
+
     processFactory.livyConf.getOption(LivyReplDriverClassPath)
     processFactory.livyConf.getOption(LivyReplDriverClassPath)
       .foreach(builder.driverClassPath)
       .foreach(builder.driverClassPath)
 
 

+ 0 - 8
apps/spark/java/livy-spark/src/main/scala/com/cloudera/hue/livy/spark/interactive/InteractiveSessionProcessFactory.scala

@@ -31,12 +31,4 @@ class InteractiveSessionProcessFactory(processFactory: SparkProcessBuilderFactor
   protected override def create(id: Int, process: SparkProcess, createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
   protected override def create(id: Int, process: SparkProcess, createInteractiveRequest: CreateInteractiveRequest): InteractiveSession = {
     InteractiveSessionProcess(id, process, createInteractiveRequest)
     InteractiveSessionProcess(id, process, createInteractiveRequest)
   }
   }
-
-  override def sparkBuilder(id: Int, request: CreateInteractiveRequest) = {
-    val builder = super.sparkBuilder(id, request)
-
-    sys.env.get("LIVY_REPL_JAVA_OPTS").foreach(builder.driverJavaOptions)
-
-    builder
-  }
 }
 }