Repository: zeppelin Updated Branches: refs/heads/master 150f69676 -> c2a91e96c
ZEPPELIN-1815. Support Spark 2.1 ### What is this PR for? This PR is to update the max supported spark version to be 2.1 as Spark 2.1 is released. I didn't change pom file and travis script to update spark version. I think we can wait for some time until we confirm spark 2.1 is stable enough. ### What type of PR is it? [Improvement] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1815 ### How should this be tested? Tested on spark 2.1 ### Screenshots (if appropriate)  ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #1787 from zjffdu/ZEPPELIN-1815 and squashes the following commits: b2ebf3a [Jeff Zhang] add timeout for connectBackend 0c17cf0 [Jeff Zhang] add build with spark 2.1.0 f7e72c9 [Jeff Zhang] ZEPPELIN-1815. Support Spark 2.1 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c2a91e96 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c2a91e96 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c2a91e96 Branch: refs/heads/master Commit: c2a91e96c72aad020435dfd986b6888c73a4d029 Parents: 150f696 Author: Jeff Zhang <zjf...@apache.org> Authored: Sun Jan 1 16:03:05 2017 +0800 Committer: Jongyoul Lee <jongy...@apache.org> Committed: Wed Jan 4 12:23:50 2017 +0900 ---------------------------------------------------------------------- .travis.yml | 4 ++++ spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java | 4 ++-- spark/src/main/resources/R/zeppelin_sparkr.R | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a91e96/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index f3e0088..89ca600 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,10 @@ matrix: - jdk: "oraclejdk7" env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Pspark-2.0 -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" + # Test all modules with spark 2.1.0 and scala 2.11 + - jdk: "oraclejdk7" + env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pspark-2.0 -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" + # Test all modules with scala 2.10 - jdk: "oraclejdk7" env: SCALA_VER="2.10" SPARK_VER="1.6.3" HADOOP_VER="2.6" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.6 -Ppyspark -Psparkr -Pscalding -Pbeam -Pexamples -Pscala-2.10" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" TEST_PROJECTS="" http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a91e96/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java ---------------------------------------------------------------------- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java index c8a7c79..8e47ce3 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java @@ -34,10 +34,10 @@ public class SparkVersion { public static final SparkVersion SPARK_1_6_0 = SparkVersion.fromVersionString("1.6.0"); public static final SparkVersion SPARK_2_0_0 = SparkVersion.fromVersionString("2.0.0"); - public static final SparkVersion SPARK_2_1_0 = SparkVersion.fromVersionString("2.1.0"); + public static final SparkVersion SPARK_2_2_0 = SparkVersion.fromVersionString("2.2.0"); public static final SparkVersion MIN_SUPPORTED_VERSION = SPARK_1_0_0; - public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_1_0; + public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_2_0; private int version; private String versionString; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c2a91e96/spark/src/main/resources/R/zeppelin_sparkr.R ---------------------------------------------------------------------- diff --git a/spark/src/main/resources/R/zeppelin_sparkr.R b/spark/src/main/resources/R/zeppelin_sparkr.R index 0d7b64d..e95513f 100644 --- a/spark/src/main/resources/R/zeppelin_sparkr.R +++ b/spark/src/main/resources/R/zeppelin_sparkr.R @@ -31,7 +31,7 @@ print(paste("LibPath ", libPath)) library(SparkR) -SparkR:::connectBackend("localhost", port) +SparkR:::connectBackend("localhost", port, 6000) # scStartTime is needed by R/pkg/R/sparkR.R assign(".scStartTime", as.integer(Sys.time()), envir = SparkR:::.sparkREnv)
