You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by bz...@apache.org on 2016/07/06 07:29:58 UTC
zeppelin git commit: [Zeppelin - 1104] ZeppelinHub storage max note
size to 64Mb
Repository: zeppelin
Updated Branches:
refs/heads/master c884a5113 -> 90a7e518c
[Zeppelin - 1104] ZeppelinHub storage max note size to 64Mb
### What is this PR for?
This is to increase default note (text message) size used in ZeppelinHub storage layer from 64Kb to 64Mb.
### What type of PR is it?
Improvement
### Todos
* [x] - change ws client configuration
### What is the Jira issue?
[ZEPPELIN-1104](https://issues.apache.org/jira/browse/ZEPPELIN-1104)
### How should this be tested?
1. configure to use ZeppelinHub storage
2. create any note larger than 64Kb
3. edit note
4. shouldn't receive the exception traceback reported in the issue
### 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: Khalid Huseynov <kh...@nflabs.com>
Closes #1123 from khalidhuseynov/fix/zeppelinhub-ws-max-size and squashes the following commits:
871d825 [Khalid Huseynov] change max text message size to 64Mb
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/90a7e518
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/90a7e518
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/90a7e518
Branch: refs/heads/master
Commit: 90a7e518c2f615f27964f1ce2f8089bc6da1f8ae
Parents: c884a51
Author: Khalid Huseynov <kh...@nflabs.com>
Authored: Mon Jul 4 20:17:40 2016 +0900
Committer: Alexander Bezzubov <bz...@apache.org>
Committed: Wed Jul 6 16:29:23 2016 +0900
----------------------------------------------------------------------
.../zeppelin/notebook/repo/zeppelinhub/websocket/Client.java | 7 +++++++
.../notebook/repo/zeppelinhub/websocket/ZeppelinClient.java | 2 ++
.../repo/zeppelinhub/websocket/ZeppelinhubClient.java | 7 +++----
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/90a7e518/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/Client.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/Client.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/Client.java
index fe2eabf..cd4d4a6 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/Client.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/Client.java
@@ -32,6 +32,9 @@ public class Client {
private final ZeppelinClient zeppelinClient;
private static Client instance = null;
+ private static final int MB = 1048576;
+ private static final int MAXIMUM_NOTE_SIZE = 64 * MB;
+
public static Client initialize(String zeppelinUri, String zeppelinhubUri, String token,
ZeppelinConfiguration conf) {
if (instance == null) {
@@ -76,4 +79,8 @@ public class Client {
public void relayToZeppelin(Message message, String noteId) {
zeppelinClient.send(message, noteId);
}
+
+ public static int getMaxNoteSize() {
+ return MAXIMUM_NOTE_SIZE;
+ }
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/90a7e518/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
index 8ac6ebe..1d7fe7e 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinClient.java
@@ -90,6 +90,8 @@ public class ZeppelinClient {
SslContextFactory sslContextFactory = new SslContextFactory();
WebSocketClient client = new WebSocketClient(sslContextFactory);
client.setMaxIdleTimeout(5 * min * 1000);
+ client.setMaxTextMessageBufferSize(Client.getMaxNoteSize());
+ client.getPolicy().setMaxTextMessageSize(Client.getMaxNoteSize());
//TODO(khalid): other client settings
return client;
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/90a7e518/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java
index 9bcd035..c4179b8 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/websocket/ZeppelinhubClient.java
@@ -60,9 +60,7 @@ public class ZeppelinhubClient {
private final URI zeppelinhubWebsocketUrl;
private final ClientUpgradeRequest conectionRequest;
private final String zeppelinhubToken;
-
- private static final int MB = 1048576;
- private static final int MAXIMUN_TEXT_SIZE = 64 * MB;
+
private static final long CONNECTION_IDLE_TIME = TimeUnit.SECONDS.toMillis(30);
private static ZeppelinhubClient instance = null;
private static Gson gson;
@@ -155,7 +153,8 @@ public class ZeppelinhubClient {
private WebSocketClient createNewWebsocketClient() {
SslContextFactory sslContextFactory = new SslContextFactory();
WebSocketClient client = new WebSocketClient(sslContextFactory);
- client.setMaxTextMessageBufferSize(MAXIMUN_TEXT_SIZE);
+ client.setMaxTextMessageBufferSize(Client.getMaxNoteSize());
+ client.getPolicy().setMaxTextMessageSize(Client.getMaxNoteSize());
client.setMaxIdleTimeout(CONNECTION_IDLE_TIME);
return client;
}