You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2021/09/28 03:27:39 UTC
[zeppelin] branch branch-0.10 updated: ZEPPELIN-5536 Update protoc
and grpc for Linux ARM64
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.10
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.10 by this push:
new 977dfcc ZEPPELIN-5536 Update protoc and grpc for Linux ARM64
977dfcc is described below
commit 977dfcc245438ea4e401f43fd1cda6cd87137880
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Sep 24 14:21:35 2021 +0300
ZEPPELIN-5536 Update protoc and grpc for Linux ARM64
### What is this PR for?
Update protoc and grpc to their first versions that support Linux ARM64 architecture.
With this the build on Linux ARM64 passes!
### What type of PR is it?
Bug Fix
### What is the Jira issue?
[ZEPPELIN-5536](https://issues.apache.org/jira/browse/ZEPPELIN-5536)
### How should this be tested?
Run the build on Linux ARM64, e.g. at TravisCI or even better CircleCI on ARM64 hardware!
Let me know if you want me to setup either of those!
### Questions:
* Does the licenses files need update? - NO
* Is there breaking changes for older versions? - Hopefully not! There is one API break in Grpc APIs (`usePlaintext()`), but there might be problems in reading serialized messages with the old versions
* Does this needs documentation? - NO
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Closes #4233 from martin-g/update-protobuf-and-grpc and squashes the following commits:
60b0c1d366 [Martin Tzvetanov Grigorov] ZEPPELIN-5536 Update protoc and grpc for Linux ARM64
(cherry picked from commit a1fe668b42d5e150280a7f2060752a08f8fc069f)
Signed-off-by: Jeff Zhang <zj...@apache.org>
---
pom.xml | 2 ++
rlang/pom.xml | 1 -
zeppelin-jupyter-interpreter/pom.xml | 5 ++---
.../main/java/org/apache/zeppelin/jupyter/JupyterKernelClient.java | 2 +-
.../java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 135b179..8b80d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,8 @@
<quartz.scheduler.version>2.3.2</quartz.scheduler.version>
<jettison.version>1.4.0</jettison.version>
<jsoup.version>1.13.1</jsoup.version>
+ <protoc.version>3.5.0</protoc.version>
+ <grpc.version>1.26.0</grpc.version>
<!-- test library versions -->
<junit.version>4.12</junit.version>
diff --git a/rlang/pom.xml b/rlang/pom.xml
index ac9c333..69e125c 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -35,7 +35,6 @@
<properties>
<interpreter.name>r</interpreter.name>
<spark.version>2.4.5</spark.version>
- <grpc.version>1.15.0</grpc.version>
<spark.archive>spark-${spark.version}</spark.archive>
<spark.src.download.url>
diff --git a/zeppelin-jupyter-interpreter/pom.xml b/zeppelin-jupyter-interpreter/pom.xml
index b6e413c..8bc7815 100644
--- a/zeppelin-jupyter-interpreter/pom.xml
+++ b/zeppelin-jupyter-interpreter/pom.xml
@@ -34,7 +34,6 @@
<properties>
<interpreter.name>jupyter</interpreter.name>
<python.py4j.version>0.10.7</python.py4j.version>
- <grpc.version>1.15.0</grpc.version>
</properties>
<dependencies>
@@ -129,9 +128,9 @@
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}</pluginArtifact>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
<executions>
<execution>
diff --git a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelClient.java b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelClient.java
index 51b3b9a..a8d4c58 100644
--- a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelClient.java
+++ b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelClient.java
@@ -71,7 +71,7 @@ public class JupyterKernelClient {
* Construct client for accessing RouteGuide server at {@code host:port}.
*/
public JupyterKernelClient(String host, int port, String kernel) {
- this(ManagedChannelBuilder.forAddress(host, port).usePlaintext(true), new Properties(),
+ this(ManagedChannelBuilder.forAddress(host, port).usePlaintext(), new Properties(),
kernel);
}
diff --git a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
index ea97af4..38a4061 100644
--- a/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
+++ b/zeppelin-jupyter-interpreter/src/main/java/org/apache/zeppelin/jupyter/JupyterKernelInterpreter.java
@@ -137,7 +137,7 @@ public class JupyterKernelInterpreter extends AbstractInterpreter {
32 * 1024 * 1024 + ""));
jupyterKernelClient = new JupyterKernelClient(ManagedChannelBuilder.forAddress("127.0.0.1",
- kernelPort).usePlaintext(true).maxInboundMessageSize(messageSize),
+ kernelPort).usePlaintext().maxInboundMessageSize(messageSize),
getProperties(), kernel);
launchJupyterKernel(kernelPort);
} catch (Exception e) {