Merge pull request #468 from haitaoyao/master

support customized java options for Master, Worker, Executor, and Repl

.gitignore

@@ -34,3 +34,5 @@ log/
 spark-tests.log
 streaming-tests.log
 dependency-reduced-pom.xml
+.ensime
+.ensime_lucene

core/src/main/scala/spark/SparkContext.scala

@@ -439,7 +439,7 @@ class SparkContext(
   }
 
   /**
-   * Broadcast a read-only variable to the cluster, returning a [[spark.Broadcast]] object for
+   * Broadcast a read-only variable to the cluster, returning a [[spark.broadcast.Broadcast]] object for
    * reading it in distributed functions. The variable will be sent to each cluster only once.
    */
   def broadcast[T](value: T) = env.broadcastManager.newBroadcast[T](value, isLocal)

run

@@ -25,6 +25,26 @@ if [ "$1" = "spark.deploy.master.Master" -o "$1" = "spark.deploy.worker.Worker"
   SPARK_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS   # Empty by default
 fi
 
+
+# Add java opts for master, worker, executor. The opts maybe null
+case "$1" in
+	'spark.deploy.master.Master')
+		SPARK_JAVA_OPTS+=" $SPARK_MASTER_OPTS"
+		;;
+	'spark.deploy.worker.Worker')
+		SPARK_JAVA_OPTS+=" $SPARK_WORKER_OPTS"
+		;;
+	'spark.executor.StandaloneExecutorBackend')
+		SPARK_JAVA_OPTS+=" $SPARK_EXECUTOR_OPTS"
+		;;
+	'spark.executor.MesosExecutorBackend')
+		SPARK_JAVA_OPTS+=" $SPARK_EXECUTOR_OPTS"
+		;;
+	'spark.repl.Main')
+		SPARK_JAVA_OPTS+=" $SPARK_REPL_OPTS"
+		;;
+esac
+
 if [ "$SPARK_LAUNCH_WITH_SCALA" == "1" ]; then
   if [ `command -v scala` ]; then
     RUNNER="scala"