You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2019/03/16 04:16:58 UTC
[bigtop] branch master updated: BIGTOP-3190. Compatibility issue
for Zeppelin with Spark 2.2.3 (#499)
This is an automated email from the ASF dual-hosted git repository.
evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 2140427 BIGTOP-3190. Compatibility issue for Zeppelin with Spark 2.2.3 (#499)
2140427 is described below
commit 214042784b97174cc6aec9ce09521dd1aa17a13f
Author: Evans Ye <ev...@apache.org>
AuthorDate: Sat Mar 16 12:16:53 2019 +0800
BIGTOP-3190. Compatibility issue for Zeppelin with Spark 2.2.3 (#499)
---
.../zeppelin/patch0-spark-2.2.3-compatibility.diff | 48 ++++++++++++++++++++++
.../src/rpm/zeppelin/SPECS/zeppelin.spec | 3 ++
2 files changed, 51 insertions(+)
diff --git a/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff b/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff
new file mode 100644
index 0000000..c51f88b
--- /dev/null
+++ b/bigtop-packages/src/common/zeppelin/patch0-spark-2.2.3-compatibility.diff
@@ -0,0 +1,48 @@
+diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
+index 6e7da6dc6..298e0b1ca 100644
+--- a/spark-dependencies/pom.xml
++++ b/spark-dependencies/pom.xml
+@@ -546,9 +546,9 @@
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+- <spark.version>2.2.0</spark.version>
++ <spark.version>2.2.3</spark.version>
+ <protobuf.version>2.5.0</protobuf.version>
+- <py4j.version>0.10.4</py4j.version>
++ <py4j.version>0.10.7</py4j.version>
+ </properties>
+ </profile>
+diff --git a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
+index 9c1eb38d5..155f645dc 100644
+--- a/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
++++ b/r/src/main/scala/org/apache/spark/api/r/RBackendHelper.scala
+@@ -30,7 +30,7 @@ class RBackendHelper(val backend : RBackend) {
+ var port : Int = 0
+
+ def init() : Int = {
+- port = backend.init()
++ port = backend.init()._1
+ port
+ }
+
+@@ -81,4 +81,4 @@ Its for testing purposes and should never be called
+
+ def apply() : RBackendHelper = new RBackendHelper(new RBackend())
+
+-}
+\ No newline at end of file
++}
+diff --git a/spark/src/main/scala/org/apache/spark/SparkRBackend.scala b/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
+index 05f1ac0e3..500e43f3f 100644
+--- a/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
++++ b/spark/src/main/scala/org/apache/spark/SparkRBackend.scala
+@@ -30,7 +30,7 @@ object SparkRBackend {
+ }
+
+ def init() : Int = {
+- portNumber = backend.init()
++ portNumber = backend.init()._1
+ portNumber
+ }
+
diff --git a/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec b/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
index 822503b..931b565 100644
--- a/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
+++ b/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
@@ -51,6 +51,7 @@ Source3: init.d.tmpl
Source4: install_zeppelin.sh
Source5: zeppelin-env.sh
Source6: zeppelin.svc
+#BIGTOP_PATCH_FILES
Requires: bigtop-utils >= 0.7, hadoop-client, spark-core >= 1.5, spark-python >= 1.5
Requires(preun): /sbin/service
AutoReq: no
@@ -77,6 +78,8 @@ You can make beautiful data-driven, interactive and collaborative documents with
%prep
%setup -n %{name}-%{zeppelin_base_version}
+#BIGTOP_PATCH_COMMANDS
+
%build
bash $RPM_SOURCE_DIR/do-component-build