From f7e72c93901dc291b3d322b4862ba83ae714d247 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Wed, 21 Dec 2016 08:01:48 +0800 Subject: [PATCH 1/3] ZEPPELIN-1815. Support Spark 2.1 --- .../src/main/java/org/apache/zeppelin/spark/SparkVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c8a7c79126b..8e47ce3b825 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; From 0c17cf0df8dd41c1f2b81cb9a64a82a7b6b87882 Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Sat, 31 Dec 2016 22:29:15 +0800 Subject: [PATCH 2/3] add build with spark 2.1.0 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index acad5c92678..7655387b010 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="" From b2ebf3ad4aa2d5ae6b23182b1d98eb6d521498fb Mon Sep 17 00:00:00 2001 From: Jeff Zhang Date: Sun, 1 Jan 2017 16:03:05 +0800 Subject: [PATCH 3/3] add timeout for connectBackend --- spark/src/main/resources/R/zeppelin_sparkr.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark/src/main/resources/R/zeppelin_sparkr.R b/spark/src/main/resources/R/zeppelin_sparkr.R index 0d7b64dc0f4..e95513f7454 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)