diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-23 23:38:15 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-23 23:38:15 -0800 |
| commit | 3b9f929467f3b14e780df459919a4d6c0c7ee772 (patch) | |
| tree | c97ce948d0dc5615ef26a781d30a35bce0468d42 | |
| parent | beb79dbbfd02b7bcbf1682f69066c3da78cdde24 (diff) | |
| parent | 8215b95547d9ca8afc56420d5622173695bb268a (diff) | |
| download | spark-3b9f929467f3b14e780df459919a4d6c0c7ee772.tar.gz spark-3b9f929467f3b14e780df459919a4d6c0c7ee772.tar.bz2 spark-3b9f929467f3b14e780df459919a4d6c0c7ee772.zip | |
Merge pull request #468 from haitaoyao/master
support customized java options for Master, Worker, Executor, and Repl
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 2 | ||||
| -rwxr-xr-x | run | 20 |
3 files changed, 23 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 88d7b56181..155e785b01 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ log/ spark-tests.log streaming-tests.log dependency-reduced-pom.xml +.ensime +.ensime_lucene diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index d39767c3b3..f40bb7935f 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/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) @@ -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" |