Updated Branches: refs/heads/branch-0.9 410ba06ff -> e5f8917fd
Merge pull request #484 from tdas/run-example-fix Made run-example respect SPARK_JAVA_OPTS and SPARK_MEM. bin/run-example scripts was not passing Java properties set through the SPARK_JAVA_OPTS to the example. This is important for examples like Twitter** as the Twitter authentication information must be set through java properties. Hence added the same JAVA_OPTS code in run-example as it is in bin/spark-class script. Also added SPARK_MEM, in case someone wants to run the example with different amounts of memory. This can be removed if it is not tune with the intended semantics of the run-example scripts. @matei Please check this soon I want this to go in 0.9-rc4 (cherry picked from commit c67d3d8beb101fff2ea6397b759dd1bfdf9fcfa5) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e5f8917f Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e5f8917f Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e5f8917f Branch: refs/heads/branch-0.9 Commit: e5f8917fd75e1c6f596db7f1bbca5760e3b6c301 Parents: 410ba06 Author: Patrick Wendell <pwend...@gmail.com> Authored: Mon Jan 20 23:34:35 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Mon Jan 20 23:35:07 2014 -0800 ---------------------------------------------------------------------- bin/run-example | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e5f8917f/bin/run-example ---------------------------------------------------------------------- diff --git a/bin/run-example b/bin/run-example index 2e9d514..adba7dd 100755 --- a/bin/run-example +++ b/bin/run-example @@ -76,11 +76,20 @@ else fi fi +# Set JAVA_OPTS to be able to load native libraries and to set heap size +JAVA_OPTS="$SPARK_JAVA_OPTS" +JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$SPARK_LIBRARY_PATH" +# Load extra JAVA_OPTS from conf/java-opts, if it exists +if [ -e "$FWDIR/conf/java-opts" ] ; then + JAVA_OPTS="$JAVA_OPTS `cat $FWDIR/conf/java-opts`" +fi +export JAVA_OPTS + if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then echo -n "Spark Command: " - echo "$RUNNER" -cp "$CLASSPATH" "$@" + echo "$RUNNER" -cp "$CLASSPATH" $JAVA_OPTS "$@" echo "========================================" echo fi -exec "$RUNNER" -cp "$CLASSPATH" "$@" +exec "$RUNNER" -cp "$CLASSPATH" $JAVA_OPTS "$@"
