[iotdb] branch master updated: [IOTDB-3096] [Auth] fix default config of user folder and role folder (#5797)

[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/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 241c36a50b [IOTDB-3096] [Auth] fix default config of user folder and 
role folder (#5797)
241c36a50b is described below

commit 241c36a50bc19d2d6c0a477c0d919de4f25ba185
Author: ZhangHongYin <46039728+sprico...@users.noreply.github.com>
AuthorDate: Thu May 5 11:02:05 2022 +0800

    [IOTDB-3096] [Auth] fix default config of user folder and role folder 
(#5797)
---
 .../org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java    | 8 ++++++++
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 08b914e017..772a5c8f77 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -47,12 +47,20 @@ public class ConfigNodeDescriptor {
     return conf;
   }
 
+  /** init common config according to iotdb config */
+  private void initCommonConfig() {
+    // first init the user and role folder in common config
+    commonConfig.setUserFolder(conf.getSystemDir() + File.separator + "users");
+    commonConfig.setRoleFolder(conf.getSystemDir() + File.separator + "roles");
+  }
+
   /**
    * get props url location
    *
    * @return url object if location exit, otherwise null.
    */
   public URL getPropsUrl() {
+    initCommonConfig();
     // Check if a config-directory was specified first.
     String urlString = System.getProperty(ConfigNodeConstant.CONFIGNODE_CONF, 
null);
     // If it wasn't, check if a home directory was provided
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 0bad3fcb12..866b786e6f 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
@@ -129,9 +129,17 @@ public class IoTDBDescriptor {
     }
   }
 
+  /** init common config according to iotdb config */
+  private void initCommonConfig() {
+    // first init the user and role folder in common config
+    commonConfig.setUserFolder(conf.getSystemDir() + File.separator + "users");
+    commonConfig.setRoleFolder(conf.getSystemDir() + File.separator + "roles");
+  }
+
   /** load an property file and set TsfileDBConfig variables. */
   @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity 
warning
   private void loadProps() {
+    initCommonConfig();
     URL url = getPropsUrl();
     if (url == null) {
       logger.warn("Couldn't load the configuration from any of the known 
sources.");