[zeppelin] branch branch-0.10 updated: [ZEPPELIN-5510]Thread leakage in JobManager of flink interpreter.
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 3990ce5 [ZEPPELIN-5510]Thread leakage in JobManager of flink
interpreter.
3990ce5 is described below
commit 3990ce5efd7f1a0cf709854af627ab25dce36f2d
Author: nicolasgong
AuthorDate: Mon Sep 27 12:43:57 2021 +0800
[ZEPPELIN-5510]Thread leakage in JobManager of flink interpreter.
[ZEPPELIN-5510] Thread leakage in JobManager of flink interpreter.
### What is this PR for?
There are some logic problems, which may lead to thread leaks.
Fix code issues.
### What type of PR is it?
[Improvement]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-5510
Author: nicolasgong
Author: YiningGong
Closes #4216 from NicolasGong/bugfix-0.2 and squashes the following commits:
57835a8985 [nicolasgong] Added null - value verification for parameters
a9bb128c22 [YiningGong] Thread leakage in JobManager of flink interpreter.
(cherry picked from commit 79750a88025bd64cff5830cf2ec8e6a6181454f5)
Signed-off-by: Jeff Zhang
---
.../main/java/org/apache/zeppelin/flink/JobManager.java | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git
a/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
b/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
index d60ff1a..49c803a 100644
---
a/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
+++
b/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
@@ -62,19 +62,20 @@ public class JobManager {
LOGGER.info("Creating JobManager at flinkWebUrl: {}, displayedFlinkWebUrl:
{}",
flinkWebUrl, displayedFlinkWebUrl);
}
-
+
public void addJob(InterpreterContext context, JobClient jobClient) {
String paragraphId = context.getParagraphId();
JobClient previousJobClient = this.jobs.put(paragraphId, jobClient);
+if (previousJobClient != null) {
+ LOGGER.warn("There's another Job {} that is associated with paragraph
{}",
+ jobClient.getJobID(), paragraphId);
+ return;
+}
long checkInterval =
Long.parseLong(properties.getProperty("zeppelin.flink.job.check_interval",
"1000"));
FlinkJobProgressPoller thread = new FlinkJobProgressPoller(flinkWebUrl,
jobClient.getJobID(), context, checkInterval);
thread.setName("JobProgressPoller-Thread-" + paragraphId);
thread.start();
this.jobProgressPollerMap.put(jobClient.getJobID(), thread);
-if (previousJobClient != null) {
- LOGGER.warn("There's another Job {} that is associated with paragraph
{}",
- jobClient.getJobID(), paragraphId);
-}
}
public void removeJob(String paragraphId) {
@@ -87,6 +88,12 @@ public class JobManager {
}
FlinkJobProgressPoller jobProgressPoller =
this.jobProgressPollerMap.remove(jobClient.getJobID());
+if (jobProgressPoller == null) {
+LOGGER.warn("Unable to remove poller, because no poller is associated
with paragraph: "
++ paragraphId);
+return;
+}
+
jobProgressPoller.cancel();
jobProgressPoller.interrupt();
}
[zeppelin] branch master updated: [ZEPPELIN-5510]Thread leakage in JobManager of flink interpreter.
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 79750a8 [ZEPPELIN-5510]Thread leakage in JobManager of flink
interpreter.
79750a8 is described below
commit 79750a88025bd64cff5830cf2ec8e6a6181454f5
Author: nicolasgong
AuthorDate: Mon Sep 27 12:43:57 2021 +0800
[ZEPPELIN-5510]Thread leakage in JobManager of flink interpreter.
[ZEPPELIN-5510] Thread leakage in JobManager of flink interpreter.
### What is this PR for?
There are some logic problems, which may lead to thread leaks.
Fix code issues.
### What type of PR is it?
[Improvement]
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-5510
Author: nicolasgong
Author: YiningGong
Closes #4216 from NicolasGong/bugfix-0.2 and squashes the following commits:
57835a8985 [nicolasgong] Added null - value verification for parameters
a9bb128c22 [YiningGong] Thread leakage in JobManager of flink interpreter.
---
.../main/java/org/apache/zeppelin/flink/JobManager.java | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git
a/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
b/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
index d60ff1a..49c803a 100644
---
a/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
+++
b/flink/flink-scala-parent/src/main/java/org/apache/zeppelin/flink/JobManager.java
@@ -62,19 +62,20 @@ public class JobManager {
LOGGER.info("Creating JobManager at flinkWebUrl: {}, displayedFlinkWebUrl:
{}",
flinkWebUrl, displayedFlinkWebUrl);
}
-
+
public void addJob(InterpreterContext context, JobClient jobClient) {
String paragraphId = context.getParagraphId();
JobClient previousJobClient = this.jobs.put(paragraphId, jobClient);
+if (previousJobClient != null) {
+ LOGGER.warn("There's another Job {} that is associated with paragraph
{}",
+ jobClient.getJobID(), paragraphId);
+ return;
+}
long checkInterval =
Long.parseLong(properties.getProperty("zeppelin.flink.job.check_interval",
"1000"));
FlinkJobProgressPoller thread = new FlinkJobProgressPoller(flinkWebUrl,
jobClient.getJobID(), context, checkInterval);
thread.setName("JobProgressPoller-Thread-" + paragraphId);
thread.start();
this.jobProgressPollerMap.put(jobClient.getJobID(), thread);
-if (previousJobClient != null) {
- LOGGER.warn("There's another Job {} that is associated with paragraph
{}",
- jobClient.getJobID(), paragraphId);
-}
}
public void removeJob(String paragraphId) {
@@ -87,6 +88,12 @@ public class JobManager {
}
FlinkJobProgressPoller jobProgressPoller =
this.jobProgressPollerMap.remove(jobClient.getJobID());
+if (jobProgressPoller == null) {
+LOGGER.warn("Unable to remove poller, because no poller is associated
with paragraph: "
++ paragraphId);
+return;
+}
+
jobProgressPoller.cancel();
jobProgressPoller.interrupt();
}
[zeppelin] branch branch-0.10 updated: [ZEPPELIN-5525] Python vanillar interpreter doesn't' work in Python 3.8
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 be57acc [ZEPPELIN-5525] Python vanillar interpreter doesn't' work in
Python 3.8
be57acc is described below
commit be57accef8452da5974b8a5529ffa8b52223921e
Author: Jeff Zhang
AuthorDate: Thu Sep 16 16:41:46 2021 +0800
[ZEPPELIN-5525] Python vanillar interpreter doesn't' work in Python 3.8
### What is this PR for?
The root cause is due to ast api is changed after python 3.8, see
https://github.com/ipython/ipython/pull/11593.
* The PR fixed this issue in `zeppelin_python.py`.
* This PR add tests for Python 3.8 for both python interpreter & spark
interpreter (spark 2.4 doesn't support python 3.8, so there's no python 3.8
test for spark 2.4). `jupyter_client` 5 is used because jupyter_client 7
doesn't work (tracked in ZEPPELIN-5533)
* bokeh test is disabled for flink interpreter. Because pyflink's
dependencies conflicts with bokeh2.
### What type of PR is it?
[Bug Fix ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5525
### How should this be tested?
* Ci pass
### 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
Closes #4230 from zjffdu/ZEPPELIN-5525 and squashes the following commits:
b816a530c0 [Jeff Zhang] [ZEPPELIN-5525] Python vanillar interpreter
doesn't' work in Python 3.8
(cherry picked from commit fa1f72891f7c83911deefedef5275fa766b5b6ab)
Signed-off-by: Jeff Zhang
---
.github/workflows/core.yml | 31 +++---
.../zeppelin/flink/IPyFlinkInterpreterTest.java| 6
.../src/main/resources/python/zeppelin_python.py | 13 ++--
.../zeppelin/python/IPythonInterpreterTest.java| 24 ++
testing/env_python_3.7_with_R.yml | 33 +++
testing/env_python_3.8_with_R.yml | 33 +++
testing/env_python_3_with_R.yml| 37 +++---
testing/env_python_3_with_R_and_tensorflow.yml | 36 ++---
testing/env_python_3_with_flink_110.yml| 34 ++--
testing/env_python_3_with_flink_111.yml| 34 ++--
testing/env_python_3_with_flink_112.yml| 37 +++---
testing/env_python_3_with_flink_113.yml| 37 +++---
12 files changed, 231 insertions(+), 124 deletions(-)
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 81e0822..3f866fd 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -32,6 +32,7 @@ jobs:
fail-fast: false
matrix:
hadoop: [hadoop2, hadoop3]
+python: [3.7, 3.8]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -51,12 +52,12 @@ jobs:
key: ${{ runner.os }}-zeppelin-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-zeppelin-
- - name: Setup conda environment with python 3.7 and R
+ - name: Setup conda environment with python ${{ matrix.python }} and R
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: python_3_with_R
- environment-file: testing/env_python_3_with_R.yml
- python-version: 3.7
+ environment-file: testing/env_python_${{ matrix.python }}_with_R.yml
+ python-version: ${{ matrix.python }}
auto-activate-base: false
channel-priority: strict
- name: Make IRkernel available to Jupyter
@@ -298,6 +299,10 @@ jobs:
spark-3-0-and-scala-2-12-and-other-interpreter:
runs-on: ubuntu-20.04
+strategy:
+ fail-fast: false
+ matrix:
+python: [ 3.7, 3.8 ]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -317,12 +322,12 @@ jobs:
key: ${{ runner.os }}-zeppelin-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-zeppelin-
- - name: Setup conda environment with python 3.7 and R
+ - name: Setup conda environment with python ${{ matrix.python }} and R
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: python_3_with_R
- environment-file: testing/env_python_3_with_R.yml
- python-version: 3.7
+ environment-file: testing/env_python_${{ matrix.python }}_with_R.yml
+ python-version: ${{ matrix.python }}
auto-activate-base: false
- name: Make IRkernel available to Jupyter
[zeppelin] branch master updated: [ZEPPELIN-5525] Python vanillar interpreter doesn't' work in Python 3.8
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new fa1f728 [ZEPPELIN-5525] Python vanillar interpreter doesn't' work in
Python 3.8
fa1f728 is described below
commit fa1f72891f7c83911deefedef5275fa766b5b6ab
Author: Jeff Zhang
AuthorDate: Thu Sep 16 16:41:46 2021 +0800
[ZEPPELIN-5525] Python vanillar interpreter doesn't' work in Python 3.8
### What is this PR for?
The root cause is due to ast api is changed after python 3.8, see
https://github.com/ipython/ipython/pull/11593.
* The PR fixed this issue in `zeppelin_python.py`.
* This PR add tests for Python 3.8 for both python interpreter & spark
interpreter (spark 2.4 doesn't support python 3.8, so there's no python 3.8
test for spark 2.4). `jupyter_client` 5 is used because jupyter_client 7
doesn't work (tracked in ZEPPELIN-5533)
* bokeh test is disabled for flink interpreter. Because pyflink's
dependencies conflicts with bokeh2.
### What type of PR is it?
[Bug Fix ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5525
### How should this be tested?
* Ci pass
### 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
Closes #4230 from zjffdu/ZEPPELIN-5525 and squashes the following commits:
b816a530c0 [Jeff Zhang] [ZEPPELIN-5525] Python vanillar interpreter
doesn't' work in Python 3.8
---
.github/workflows/core.yml | 31 +++---
.../zeppelin/flink/IPyFlinkInterpreterTest.java| 6
.../src/main/resources/python/zeppelin_python.py | 13 ++--
.../zeppelin/python/IPythonInterpreterTest.java| 24 ++
testing/env_python_3.7_with_R.yml | 33 +++
testing/env_python_3.8_with_R.yml | 33 +++
testing/env_python_3_with_R.yml| 37 +++---
testing/env_python_3_with_R_and_tensorflow.yml | 36 ++---
testing/env_python_3_with_flink_110.yml| 34 ++--
testing/env_python_3_with_flink_111.yml| 34 ++--
testing/env_python_3_with_flink_112.yml| 37 +++---
testing/env_python_3_with_flink_113.yml| 37 +++---
12 files changed, 231 insertions(+), 124 deletions(-)
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 154cd24..f65e832 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -32,6 +32,7 @@ jobs:
fail-fast: false
matrix:
hadoop: [hadoop2, hadoop3]
+python: [3.7, 3.8]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -51,12 +52,12 @@ jobs:
key: ${{ runner.os }}-zeppelin-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-zeppelin-
- - name: Setup conda environment with python 3.7 and R
+ - name: Setup conda environment with python ${{ matrix.python }} and R
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: python_3_with_R
- environment-file: testing/env_python_3_with_R.yml
- python-version: 3.7
+ environment-file: testing/env_python_${{ matrix.python }}_with_R.yml
+ python-version: ${{ matrix.python }}
auto-activate-base: false
channel-priority: strict
- name: Make IRkernel available to Jupyter
@@ -298,6 +299,10 @@ jobs:
spark-3-0-and-scala-2-12-and-other-interpreter:
runs-on: ubuntu-20.04
+strategy:
+ fail-fast: false
+ matrix:
+python: [ 3.7, 3.8 ]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -317,12 +322,12 @@ jobs:
key: ${{ runner.os }}-zeppelin-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-zeppelin-
- - name: Setup conda environment with python 3.7 and R
+ - name: Setup conda environment with python ${{ matrix.python }} and R
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: python_3_with_R
- environment-file: testing/env_python_3_with_R.yml
- python-version: 3.7
+ environment-file: testing/env_python_${{ matrix.python }}_with_R.yml
+ python-version: ${{ matrix.python }}
auto-activate-base: false
- name: Make IRkernel available to Jupyter
run: |
@@ -330,11 +335,15 @@ jobs:
- name: install environment
run: |
mvn install
[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
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
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
---
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 @@
2.3.2
1.4.0
1.13.1
+3.5.0
+1.26.0
4.12
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 @@
r
2.4.5
-1.15.0
spark-${spark.version}
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 @@
jupyter
0.10.7
-1.15.0
@@ -129,9 +128,9 @@
org.xolstice.maven.plugins
protobuf-maven-plugin
-
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+
com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
grpc-java
-
io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
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),
+
[zeppelin] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new a1fe668 ZEPPELIN-5536 Update protoc and grpc for Linux ARM64
a1fe668 is described below
commit a1fe668b42d5e150280a7f2060752a08f8fc069f
Author: Martin Tzvetanov Grigorov
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
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
---
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 f18dfeb..6498b42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,8 @@
2.3.2
1.4.0
1.13.1
+3.5.0
+1.26.0
4.12
diff --git a/rlang/pom.xml b/rlang/pom.xml
index 15b4746..51125d8 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -35,7 +35,6 @@
r
2.4.5
-1.15.0
spark-${spark.version}
diff --git a/zeppelin-jupyter-interpreter/pom.xml
b/zeppelin-jupyter-interpreter/pom.xml
index 4a00561..cd81e4b 100644
--- a/zeppelin-jupyter-interpreter/pom.xml
+++ b/zeppelin-jupyter-interpreter/pom.xml
@@ -34,7 +34,6 @@
jupyter
0.10.7
-1.15.0
@@ -129,9 +128,9 @@
org.xolstice.maven.plugins
protobuf-maven-plugin
-
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+
com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}
grpc-java
-
io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
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);
[zeppelin] branch master updated (6a30c0c -> 5d0be08)
This is an automated email from the ASF dual-hosted git repository. jongyoul pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git. from 6a30c0c [ZEPPELIN-5526] interpreter setting still in error status when remove the invalid dependency add 5d0be08 [ZEPPELIN-5537] Remove code related to ZeppelinHub No new revisions were added by this update. Summary of changes: conf/shiro.ini.template| 6 - conf/zeppelin-env.cmd.template | 6 - conf/zeppelin-env.sh.template | 5 - conf/zeppelin-site.xml.template| 9 - docs/_includes/themes/zeppelin/_navigation.html| 1 - docs/index.md | 1 - docs/setup/security/shiro_authentication.md| 15 - docs/setup/storage/storage.md | 32 -- .../zeppelin/conf/ZeppelinConfiguration.java | 1 - zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml | 86 - .../repo/zeppelinhub/OldZeppelinHubRepo.java | 385 --- .../notebook/repo/zeppelinhub/ZeppelinHubRepo.java | 406 - .../org.apache.zeppelin.notebook.repo.NotebookRepo | 18 - .../repo/zeppelinhub/ZeppelinHubRepoTest.java | 155 .../zeppelinhub/websocket/ZeppelinClientTest.java | 127 --- .../websocket/ZeppelinhubClientTest.java | 72 .../websocket/mock/MockEchoWebsocketServer.java| 46 --- .../websocket/mock/MockEventServlet.java | 14 - .../websocket/mock/MockEventSocket.java| 38 -- .../websocket/protocol/ZeppelinhubMessageTest.java | 43 --- zeppelin-plugins/pom.xml | 1 - .../apache/zeppelin/realm/ZeppelinHubRealm.java| 241 .../notebook/repo/zeppelinhub/model/Instance.java | 27 -- .../zeppelinhub/model/UserSessionContainer.java| 54 --- .../repo/zeppelinhub/model/UserTokenContainer.java | 149 .../repo/zeppelinhub/rest/HttpProxyClient.java | 212 --- .../rest/ZeppelinhubRestApiHandler.java| 294 --- .../repo/zeppelinhub/security/Authentication.java | 231 .../repo/zeppelinhub/websocket/Client.java | 86 - .../repo/zeppelinhub/websocket/ZeppelinClient.java | 389 .../zeppelinhub/websocket/ZeppelinhubClient.java | 285 --- .../websocket/listener/WatcherWebsocket.java | 83 - .../websocket/listener/ZeppelinWebsocket.java | 75 .../websocket/listener/ZeppelinhubWebsocket.java | 82 - .../websocket/protocol/ZeppelinHubOp.java | 30 -- .../websocket/protocol/ZeppelinhubMessage.java | 86 - .../websocket/scheduler/SchedulerService.java | 62 .../websocket/scheduler/ZeppelinHeartbeat.java | 44 --- .../websocket/scheduler/ZeppelinHubHeartbeat.java | 48 --- .../websocket/session/ZeppelinhubSession.java | 63 .../websocket/utils/ZeppelinhubUtils.java | 129 --- 41 files changed, 4137 deletions(-) delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/pom.xml delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/OldZeppelinHubRepo.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/ZeppelinHubRepo.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/resources/META-INF/services/org.apache.zeppelin.notebook.repo.NotebookRepo delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/ZeppelinHubRepoTest.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClientTest.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClientTest.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/mock/MockEchoWebsocketServer.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/mock/MockEventServlet.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/mock/MockEventSocket.java delete mode 100644 zeppelin-plugins/notebookrepo/zeppelin-hub/src/main/test/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/protocol/ZeppelinhubMessageTest.java delete mode 100644 zeppelin-server/src/main/java/org/apache/zeppelin/realm/ZeppelinHubRealm.java delete mode 100644 zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/model/Instance.java delete mode 100644
