Commit graph

44 commits

Author SHA1 Message Date
Patrick Wendell 49cbf48bcc Small typo fix 2014-01-09 00:12:34 -08:00
Patrick Wendell 4d2e388e6a Don't delegate to users sbt.
This changes our `sbt/sbt` script to not delegate to the user's `sbt`
even if it is present. If users already have sbt installed and they
want to use their own sbt, we'd expect them to just call sbt directly
from within Spark. We no longer set any enironment variables or anything
from this script, so they should just launch sbt directly on their own.

There are a number of hard-to-debug issues which can come from the
current appraoch. One is if the user is unaware of an existing sbt
installation and now without explanation their build breaks because
they haven't configured options correctly (such as permgen size)
within their sbt. Another is if the user has a much older version
of sbt hanging around, in which case some of the older versions
don't acutally work well when newer verisons of sbt are specified
in the build file (reported by @marmbrus). A third is if the user
has done some other modification to their sbt script, such as
setting it to delegate to sbt/sbt in Spark, and this causes
that to break (also reported by @marmbrus).

So to keep things simple let's just avoid this path and
remove it. Any user who already has sbt and wants to build
spark with it should be able to understand easily how to do it.
2014-01-08 23:56:53 -08:00
Henry Saputra 226b58ada2 Add ASF header to the new sbt script. 2014-01-07 21:07:27 -08:00
Holden Karau 60a7a6b31a Use awk to extract the version 2014-01-06 23:45:27 -08:00
Holden Karau b590adb2ad Put quote arround arguments passed down to system sbt 2014-01-06 23:31:39 -08:00
Holden Karau 2dc83de72e CR feedback (sbt -> sbt/sbt and correct JAR path in script) :) 2014-01-05 23:29:26 -08:00
Holden Karau 5a598b2d7b Fix indentatation 2014-01-05 22:07:32 -08:00
Holden Karau d86dc74d79 Code review feedback 2014-01-05 22:05:30 -08:00
Holden Karau df92f1c025 reindent 2014-01-04 21:48:35 -08:00
Holden Karau d7d95a099f And update docs to match 2014-01-04 21:45:22 -08:00
Holden Karau 0d6700eb5a Make sbt in the sbt directory 2014-01-04 21:44:26 -08:00
Holden Karau d2a5c75a4d Spelling 2014-01-04 21:44:04 -08:00
Holden Karau 97123be1d7 Pass commands down to system sbt as well 2014-01-04 20:16:56 -08:00
Holden Karau 9e9a913c2f Add a script to download sbt if not present on the system 2014-01-04 20:08:35 -08:00
Prashant Sharma 6be4c11194 Removed sbt folder and changed docs accordingly 2014-01-02 14:09:37 +05:30
Josh Rosen f8ba89da21 Fix Cygwin support in several scripts.
This allows the spark-shell, spark-class, run-example, make-distribution.sh,
and ./bin/start-* scripts to work under Cygwin.  Note that this doesn't
support PySpark under Cygwin, since that requires many additional `cygpath`
calls from within Python and will be non-trivial to implement.

This PR was inspired by, and subsumes, #253 (so close #253 after this is merged).
2013-12-15 18:51:31 -08:00
Matei Zaharia 3db404a43a Run script fixes for Windows after package & assembly change 2013-09-01 23:45:57 +00:00
Matei Zaharia aab345c463 Fix finding of assembly JAR, as well as some pointers to ./run 2013-08-29 21:19:06 -07:00
Ian Buss d7f18e3d27 Pass SBT_OPTS environment through to sbt_launcher 2013-08-23 09:50:23 +01:00
Jey Kottalam 9a90667d09 Increase ReservedCodeCacheSize to 256m 2013-08-21 21:15:28 -07:00
Jey Kottalam 54e9379de2 Revert "Allow build configuration to be set in conf/spark-env.sh"
This reverts commit 66e7a38a32.
2013-08-21 21:13:34 -07:00
Jey Kottalam 66e7a38a32 Allow build configuration to be set in conf/spark-env.sh 2013-08-21 14:25:53 -07:00
Matei Zaharia c6235b51ba Merge pull request #714 from adatao/master
[BUGFIX]  Fix for sbt/sbt script SPARK_HOME setting
2013-07-18 11:43:48 -07:00
Ubuntu 88a0823c58 Consistently invoke bash with /usr/bin/env bash in scripts to make code more portable (JIRA Ticket SPARK-817) 2013-07-18 00:51:18 +00:00
ctn a1d2c34346 [BUGFIX] Fix for sbt/sbt script SPARK_HOME setting
In some environments, this command

    export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd)

echoes two paths, one by the "cd ..", and one by the "pwd". Note the resulting
erroneous -jar paths below:

    ctn@ubuntu:~/src/spark$ sbt/sbt
    + EXTRA_ARGS=
    + '[' '' '!=' '' ']'
    +++ dirname sbt/sbt
    ++ cd sbt/..
    ++ pwd
    + export 'SPARK_HOME=/home/ctn/src/spark
    /home/ctn/src/spark'
    + SPARK_HOME='/home/ctn/src/spark
    /home/ctn/src/spark'
    + export SPARK_TESTING=1
    + SPARK_TESTING=1
    + java -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=128m -jar /home/ctn/src/spark /home/ctn/src/spark/sbt/sbt-launch-0.11.3-2.jar
    Error: Invalid or corrupt jarfile /home/ctn/src/spark

Committer: ctn <ctn@adatao.com>

On branch master
Changes to be committed:

- Send output of the "cd .." part to /dev/null
	modified:   sbt/sbt
2013-07-17 11:27:11 -07:00
Matei Zaharia af3c9d5042 Add Apache license headers and LICENSE and NOTICE files 2013-07-16 17:21:33 -07:00
Matei Zaharia 1889f9f450 Increase PermGen size 2013-07-13 14:43:21 -07:00
Jey Kottalam 6bfe4bf3eb Increase ReservedCodeCacheSize for sbt 2013-04-16 09:50:59 -07:00
Matei Zaharia 0b788b760b Update Windows scripts to launch daemons with less RAM and fix a few
other issues

Conflicts:
	run2.cmd
2013-02-10 21:51:49 -08:00
Matei Zaharia 44b4a0f88f Track workers by executor ID instead of hostname to allow multiple
executors per machine and remove the need for multiple IP addresses in
unit tests.
2013-01-27 19:23:49 -08:00
root ce915cadee Made run script add test-classes onto the classpath only if SPARK_TESTING is set; fixes #216 2012-10-07 04:19:16 +00:00
Ravi Pandya afd8fc0c66 Echo off 2012-09-24 15:46:03 -07:00
Ravi Pandya 39215357af Windows command scripts for sbt and run 2012-09-24 15:43:19 -07:00
Matei Zaharia b5cf47cda3 Merge branch 'dev' of github.com:mesos/spark into dev 2012-06-15 23:36:30 -07:00
Tathagata Das 5f54bdf98b Added shutdown for akka to SparkContext.stop(). Helps a little, but many testsuites still fail. 2012-06-13 20:49:00 -04:00
Matei Zaharia 8b0bd5dd8d Update SBT to version 0.11.3-2. 2012-06-07 23:05:58 -07:00
Matei Zaharia 7fd05cbb8f Update to SBT 0.11.1 2011-11-07 20:28:08 -08:00
Ismael Juma e39edcce60 Upgrade to SBT 0.11.0. 2011-09-26 22:24:29 +01:00
Ismael Juma f686e3dacb Initial work on converting build to SBT 0.10.1 2011-07-15 03:38:30 +01:00
Matei Zaharia 8012e388a8 Give SBT a bit more memory so it can do a update / compile / test in one JVM 2011-05-31 22:17:33 -07:00
Matei Zaharia 328e51b693 Various minor fixes 2011-05-19 11:19:25 -07:00
Matei Zaharia 7e20648914 Upgraded to SBT 0.7.5 2011-05-09 14:48:39 -07:00
Matei Zaharia 26b77aece9 Increased SBT mem to 700 MB so that unit tests run more nicely 2011-02-08 17:03:28 -08:00
Matei Zaharia 89fcd96702 Initial work to get Spark compiling with SBT 0.7.5 RC0 2010-11-13 22:07:08 -08:00