Reduce default_session_timeout_ms and default_operation_timeout_ms

JDRaftKeeper · May 21, 2024 · 6b80ce0 · 6b80ce0
1 parent 237c25c
commit 6b80ce0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/docs/how-to-monitor-and-manage.md b/docs/how-to-monitor-and-manage.md
@@ -179,12 +179,12 @@ snapshot_create_interval=3600
 four_letter_word_white_list=conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,lgif,rqld,uptm,csnp
 log_dir=/data/jdolap/raft_service/raft_log
 snapshot_dir=/data/jdolap/raft_service/raft_snapshot
-max_session_timeout_ms=100000
-min_session_timeout_ms=10000
-operation_timeout_ms=10000
+max_session_timeout_ms=3600000
+min_session_timeout_ms=1000
+operation_timeout_ms=3000
 dead_session_check_period_ms=500
 heart_beat_interval_ms=500
-client_req_timeout_ms=10000
+client_req_timeout_ms=3000
 election_timeout_lower_bound_ms=3000
 election_timeout_upper_bound_ms=5000
 reserved_log_items=1000000

diff --git a/programs/server/config.xml b/programs/server/config.xml
@@ -62,14 +62,14 @@
 
         <!-- NuRaft related settings -->
         <raft_settings>
-            <!-- User minimum session timeout in millisecond, default is 10000. -->
-            <!-- <min_session_timeout_ms>10000</min_session_timeout_ms> -->
+            <!-- User minimum session timeout in millisecond, default is 1000. -->
+            <!-- <min_session_timeout_ms>1000</min_session_timeout_ms> -->
 
-            <!-- User maximum session timeout in millisecond, default is 100000. -->
-            <!-- <max_session_timeout_ms>100000</max_session_timeout_ms> -->
+            <!-- User maximum session timeout in millisecond, default is 3600000. -->
+            <!-- <max_session_timeout_ms>3600000</max_session_timeout_ms> -->
 
-            <!-- User operation timeout in millisecond, default is 10000. -->
-            <!-- <operation_timeout_ms>10000</operation_timeout_ms> -->
+            <!-- User operation timeout in millisecond, default is 3000. -->
+            <!-- <operation_timeout_ms>3000</operation_timeout_ms> -->
 
             <!-- Leader will check whether session is dead in this period, default is 500. -->
             <!-- <dead_session_check_period_ms>500</dead_session_check_period_ms> -->

diff --git a/src/ZooKeeper/ZooKeeperConstants.h b/src/ZooKeeper/ZooKeeperConstants.h
@@ -59,9 +59,9 @@ static constexpr int32_t PASSWORD_LENGTH = 16;
 /// but it can be raised up, so we have a slightly larger limit on our side.
 static constexpr int32_t MAX_STRING_OR_ARRAY_SIZE = 1 << 28; /// 256 MiB
 static constexpr int32_t DEFAULT_SESSION_TIMEOUT_MS = 30000;
-static constexpr int32_t DEFAULT_MIN_SESSION_TIMEOUT_MS = 10000;
-static constexpr int32_t DEFAULT_MAX_SESSION_TIMEOUT_MS = 100000;
-static constexpr int32_t DEFAULT_OPERATION_TIMEOUT_MS = 10000;
+static constexpr int32_t DEFAULT_MIN_SESSION_TIMEOUT_MS = 1000;
+static constexpr int32_t DEFAULT_MAX_SESSION_TIMEOUT_MS = 3600000;
+static constexpr int32_t DEFAULT_OPERATION_TIMEOUT_MS = 3000;
 static constexpr int32_t ELECTION_TIMEOUT_LOWER_BOUND_MS = 3000;
 static constexpr int32_t ELECTION_TIMEOUT_UPPER_BOUND_MS = 5000;
 

diff --git a/tests/integration/test_four_word_command/test.py b/tests/integration/test_four_word_command/test.py
@@ -295,8 +295,8 @@ def test_cmd_conf(started_cluster):
         assert result["operation_timeout_ms"] == "1000"
         assert result["dead_session_check_period_ms"] == "500"
         assert result["heart_beat_interval_ms"] == "500"
-        assert result["election_timeout_lower_bound_ms"] == "5000"
-        assert result["election_timeout_upper_bound_ms"] == "10000"
+        assert result["election_timeout_lower_bound_ms"] == "3000"
+        assert result["election_timeout_upper_bound_ms"] == "5000"
 
         assert result["reserved_log_items"] == "1000000"
         assert result["snapshot_distance"] == "3000000"