zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: [ZEPPELIN-3738] Fix enabling JMX in ZeppelinServer
Date Tue, 18 Sep 2018 00:20:29 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 2ae714340 -> d30040aa5


[ZEPPELIN-3738] Fix enabling JMX in ZeppelinServer

### What is this PR for?

There is a typo in the system variable name `ZEPPELIN_JMX_ENABLE`:
```
    // Register MBean
    if ("true".equals(System.getenv("ZEPPELIN_ENABLE_JMX"))) {
```
Variable defined in zeppelin-env.sh.template ([[ZEPPELIN-3422]](https://issues.apache.org/jira/browse/ZEPPELIN-3422)):
```
# export ZEPPELIN_JMX_ENABLE    		# Enable JMX feature by defining "true"
```
Also ZEPPELIN_JMX_ENABLE not mentioned in docs.
### What type of PR is it?
Bug Fix

### What is the Jira issue?
* [issue](https://issues.apache.org/jira/browse/ZEPPELIN-3738)

### How should this be tested?
* CI pass
* Tested manually during [[ZEPPELIN-3671]](https://github.com/apache/zeppelin/pull/3110)

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Docs updated

Author: egorklimov <klim.electronicmail@gmail.com>

Closes #3153 from egorklimov/ZEPPELIN-3738 and squashes the following commits:

4e5ffca4e [egorklimov] Docs updated & bug fixed

(cherry picked from commit e7b12a8cea106d7f0a9db86b782181cc4fe7d3c6)
Signed-off-by: Jeff Zhang <zjffdu@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d30040aa
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d30040aa
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d30040aa

Branch: refs/heads/branch-0.8
Commit: d30040aa5e6ab56e37f7d69d8cb9c6fd500bb6b8
Parents: 2ae7143
Author: egorklimov <klim.electronicmail@gmail.com>
Authored: Mon Aug 20 13:30:44 2018 +0300
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Tue Sep 18 08:20:23 2018 +0800

----------------------------------------------------------------------
 docs/setup/operation/configuration.md                   | 12 ++++++++++++
 .../java/org/apache/zeppelin/server/ZeppelinServer.java |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d30040aa/docs/setup/operation/configuration.md
----------------------------------------------------------------------
diff --git a/docs/setup/operation/configuration.md b/docs/setup/operation/configuration.md
index f2e356d..b831918 100644
--- a/docs/setup/operation/configuration.md
+++ b/docs/setup/operation/configuration.md
@@ -54,6 +54,18 @@ If both are defined, then the **environment variables** will take priority.
     <td>Zeppelin Server ssl port (used when ssl environment/property is set to true)</td>
   </tr>
   <tr>
+    <td><h6 class="properties">ZEPPELIN_JMX_ENABLE</h6></td>
+    <td><h6 class="properties">N/A</h6></td>
+    <td></td>
+    <td>Enable JMX by defining "true"</td>
+  </tr>
+  <tr>
+    <td><h6 class="properties">ZEPPELIN_JMX_PORT</h6></td>
+    <td><h6 class="properties">N/A</h6></td>
+    <td>9996</td>
+    <td>Port number which JMX uses</td>
+  </tr>
+  <tr>
     <td><h6 class="properties">ZEPPELIN_MEM</h6></td>
     <td>N/A</td>
     <td>-Xmx1024m -XX:MaxPermSize=512m</td>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d30040aa/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index bbfa490..a27e080 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -195,7 +195,7 @@ public class ZeppelinServer extends Application {
     notebook.addNotebookEventListener(notebookWsServer.getNotebookInformationListener());
 
     // Register MBean
-    if ("true".equals(System.getenv("ZEPPELIN_ENABLE_JMX"))) {
+    if ("true".equals(System.getenv("ZEPPELIN_JMX_ENABLE"))) {
       MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
       try {
         mBeanServer.registerMBean(


Mime
View raw message