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 2018/02/24 09:49:49 UTC
zeppelin git commit: [HOTFIX] rename zeppelin.ipython.grpc.framesize
to zeppelin.ipython.grpc.message_size
Repository: zeppelin
Updated Branches:
refs/heads/master ea2c94474 -> 066016437
[HOTFIX] rename zeppelin.ipython.grpc.framesize to zeppelin.ipython.grpc.message_size
### What is this PR for?
trivial change for property name renaming. Followup of #2802
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### 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 <zj...@apache.org>
Closes #2813 from zjffdu/HOTFIX_GRPC and squashes the following commits:
d899a29 [Jeff Zhang] [HOTFIX] rename zeppelin.ipython.grpc.framesize to zeppelin.ipython.grpc.message_size
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/06601643
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/06601643
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/06601643
Branch: refs/heads/master
Commit: 0660164379c12aa48321d0772598f61a56904a17
Parents: ea2c944
Author: Jeff Zhang <zj...@apache.org>
Authored: Sat Feb 24 14:25:38 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Sat Feb 24 17:49:46 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/zeppelin/python/IPythonInterpreter.java | 4 ++--
python/src/main/resources/interpreter-setting.json | 6 +++---
.../org/apache/zeppelin/python/IPythonInterpreterTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/06601643/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
----------------------------------------------------------------------
diff --git a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
index 10bf530..5c5bfe3 100644
--- a/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
+++ b/python/src/main/java/org/apache/zeppelin/python/IPythonInterpreter.java
@@ -143,10 +143,10 @@ public class IPythonInterpreter extends Interpreter implements ExecuteResultHand
int jvmGatewayPort = RemoteInterpreterUtils.findRandomAvailablePortOnAllLocalInterfaces();
LOGGER.info("Launching IPython Kernel at port: " + ipythonPort);
LOGGER.info("Launching JVM Gateway at port: " + jvmGatewayPort);
- int framesize = Integer.parseInt(getProperty("zeppelin.ipython.grpc.framesize",
+ int message_size = Integer.parseInt(getProperty("zeppelin.ipython.grpc.message_size",
32 * 1024 * 1024 + ""));
ipythonClient = new IPythonClient(ManagedChannelBuilder.forAddress("127.0.0.1", ipythonPort)
- .usePlaintext(true).maxInboundMessageSize(framesize));
+ .usePlaintext(true).maxInboundMessageSize(message_size));
launchIPythonKernel(ipythonPort);
setupJVMGateway(jvmGatewayPort);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/06601643/python/src/main/resources/interpreter-setting.json
----------------------------------------------------------------------
diff --git a/python/src/main/resources/interpreter-setting.json b/python/src/main/resources/interpreter-setting.json
index 3257e58..f36add3 100644
--- a/python/src/main/resources/interpreter-setting.json
+++ b/python/src/main/resources/interpreter-setting.json
@@ -41,10 +41,10 @@
"description": "time out for ipython launch",
"type": "number"
},
- "zeppelin.ipython.grpc.framesize": {
- "propertyName": "zeppelin.ipython.grpc.framesize",
+ "zeppelin.ipython.grpc.message_size": {
+ "propertyName": "zeppelin.ipython.grpc.message_size",
"defaultValue": "33554432",
- "description": "grpc framesize, default is 32M",
+ "description": "grpc message size, default is 32M",
"type": "number"
}
},
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/06601643/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java
----------------------------------------------------------------------
diff --git a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java
index dfc8c36..480cae3 100644
--- a/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java
+++ b/python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java
@@ -78,7 +78,7 @@ public class IPythonInterpreterTest {
@Test
public void testGrpcFrameSize() throws InterpreterException, IOException {
Properties properties = new Properties();
- properties.setProperty("zeppelin.ipython.grpc.framesize", "4");
+ properties.setProperty("zeppelin.ipython.grpc.message_size", "4");
startInterpreter(properties);
// to make this test can run under both python2 and python3
@@ -99,7 +99,7 @@ public class IPythonInterpreterTest {
close();
// increase framesize to make it work
- properties.setProperty("zeppelin.ipython.grpc.framesize", "40");
+ properties.setProperty("zeppelin.ipython.grpc.message_size", "40");
startInterpreter(properties);
// to make this test can run under both python2 and python3
result = interpreter.interpret("from __future__ import print_function", getInterpreterContext());