[incubator-iotdb] branch master updated: remove jmx user config (#1265)

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new d0221b4  remove jmx user config (#1265)
d0221b4 is described below

commit d0221b43b217cbdffafdd5a7d70ab1b4268e62bc
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Tue May 26 12:37:31 2020 +0800

    remove jmx user config (#1265)
---
 .../resources/conf/iotdb-engine.properties         | 10 ---------
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 26 ----------------------
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  4 ----
 3 files changed, 40 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties 
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 1fcb7fa..6ecb307 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -40,16 +40,6 @@ rpc_thrift_compression_enable=false
 rpc_max_concurrent_client_num=65535
 
 ####################
-### JMX Configuration
-####################
-
-# If system property com.sun.management.jmxremote.authenticate is true, user 
name should be set to environment
-jmx_user=admin
-
-# If system property com.sun.management.jmxremote.authenticate is true, 
password should be set to environment
-jmx_password=password
-
-####################
 ### Write Ahead Log Configuration
 ####################
 
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java 
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 29257db..aa0f6d2 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -112,16 +112,6 @@ public class IoTDBConfig {
   private int rpcMaxConcurrentClientNum = 65535;
 
   /**
-   * JMX user name
-   */
-  private String jmxUser = "admin";
-
-  /**
-   * JMX user password
-   */
-  private String jmxPassword = "password";
-
-  /**
    * Memory allocated for the read process
    */
   private long allocateMemoryForWrite = Runtime.getRuntime().maxMemory() * 6 / 
10;
@@ -706,22 +696,6 @@ public class IoTDBConfig {
     this.enableMetricService = enableMetricService;
   }
 
-  public String getJmxUser() {
-    return jmxUser;
-  }
-
-  public void setJmxUser(String jmxUser) {
-    this.jmxUser = jmxUser;
-  }
-
-  public String getJmxPassword() {
-    return jmxPassword;
-  }
-
-  public void setJmxPassword(String jmxPassword) {
-    this.jmxPassword = jmxPassword;
-  }
-
   void setDataDirs(String[] dataDirs) {
     this.dataDirs = dataDirs;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java 
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index ab08ead..05117c2 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -176,10 +176,6 @@ public class IoTDBDescriptor {
       conf.setRpcPort(Integer.parseInt(properties.getProperty("rpc_port",
           Integer.toString(conf.getRpcPort()))));
 
-      conf.setJmxUser(properties.getProperty("jmx_user", conf.getJmxUser()));
-
-      conf.setJmxPassword(properties.getProperty("jmx_password", 
conf.getJmxPassword()));
-
       conf.setTimestampPrecision(properties.getProperty("timestamp_precision",
           conf.getTimestampPrecision()));