(iotdb) branch rc/1.3.3 updated: Active Load: Fix load_active_listening_max_thread_num or load_active_listening_check_interval_seconds less than 0 throwing exception (#13518)

[rong]

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

rong pushed a commit to branch rc/1.3.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rc/1.3.3 by this push:
     new bc591cb25e8 Active Load: Fix load_active_listening_max_thread_num or 
load_active_listening_check_interval_seconds less than 0 throwing exception 
(#13518)
bc591cb25e8 is described below

commit bc591cb25e86830610b1ebb8aa4b849d28eb7f49
Author: YC27 <76414902+y...@users.noreply.github.com>
AuthorDate: Sat Sep 14 15:55:30 2024 +0800

    Active Load: Fix load_active_listening_max_thread_num or 
load_active_listening_check_interval_seconds less than 0 throwing exception 
(#13518)
    
    Co-authored-by: Steve Yurong Su <r...@apache.org>
    (cherry picked from commit 9ef116528ef12c720e24cd6e6185bea9c7b60cfa)
---
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 58de8530dc4..546cea28759 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -2277,19 +2277,30 @@ public class IoTDBDescriptor {
     conf.setLoadActiveListeningFailDir(
         properties.getProperty(
             "load_active_listening_fail_dir", 
conf.getLoadActiveListeningFailDir()));
-    conf.setLoadActiveListeningCheckIntervalSeconds(
+
+    final long loadActiveListeningCheckIntervalSeconds =
         Long.parseLong(
             properties.getProperty(
                 "load_active_listening_check_interval_seconds",
-                
Long.toString(conf.getLoadActiveListeningCheckIntervalSeconds()))));
-    conf.setLoadActiveListeningMaxThreadNum(
+                
Long.toString(conf.getLoadActiveListeningCheckIntervalSeconds())));
+    conf.setLoadActiveListeningCheckIntervalSeconds(
+        loadActiveListeningCheckIntervalSeconds <= 0
+            ? conf.getLoadActiveListeningCheckIntervalSeconds()
+            : loadActiveListeningCheckIntervalSeconds);
+
+    final int defaultLoadActiveListeningMaxThreadNum =
+        Math.min(
+            conf.getLoadActiveListeningMaxThreadNum(),
+            Math.max(1, Runtime.getRuntime().availableProcessors() / 2));
+    final int loadActiveListeningMaxThreadNum =
         Integer.parseInt(
             properties.getProperty(
                 "load_active_listening_max_thread_num",
-                Integer.toString(
-                    Math.min(
-                        conf.getLoadActiveListeningMaxThreadNum(),
-                        Math.max(1, Runtime.getRuntime().availableProcessors() 
/ 2))))));
+                Integer.toString(defaultLoadActiveListeningMaxThreadNum)));
+    conf.setLoadActiveListeningMaxThreadNum(
+        loadActiveListeningMaxThreadNum <= 0
+            ? defaultLoadActiveListeningMaxThreadNum
+            : loadActiveListeningMaxThreadNum);
   }
 
   private void loadLoadTsFileHotModifiedProp(Properties properties) throws 
IOException {