Repository: zeppelin Updated Branches: refs/heads/branch-0.6 34091862b -> f7027a9c3
[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 <[email protected]> Closes #1123 from khalidhuseynov/fix/zeppelinhub-ws-max-size and squashes the following commits: 871d825 [Khalid Huseynov] change max text message size to 64Mb (cherry picked from commit 90a7e518c2f615f27964f1ce2f8089bc6da1f8ae) Signed-off-by: Alexander Bezzubov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f7027a9c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f7027a9c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f7027a9c Branch: refs/heads/branch-0.6 Commit: f7027a9c3a35d4f443f60be0f1ae3e8c82e297f2 Parents: 3409186 Author: Khalid Huseynov <[email protected]> Authored: Mon Jul 4 20:17:40 2016 +0900 Committer: Alexander Bezzubov <[email protected]> Committed: Wed Jul 6 16:30:16 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/f7027a9c/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/f7027a9c/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/f7027a9c/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; }
