- JGRP-2811: support time units parsing for property values

- Also adds support for kib, mib, gib in size units - Document time and size units - Some trimming: "min_interval=15s " -> "min_interval=15s" - Added support for attribute writing via probe, e.g. probe NAKACK2.xmit_interval="1.2s"
belaban · Jun 26, 2024 · c0a2876 · c0a2876
1 parent 83355e4
commit c0a2876
Show file tree

Hide file tree

Showing 24 changed files with 232 additions and 140 deletions.
diff --git a/conf/asym-encrypt.xml b/conf/asym-encrypt.xml
@@ -6,7 +6,7 @@
     <UDP />
     <PING/>
     <MERGE3/>
-    <FD_ALL3 timeout="8000" interval="3000"/>
+    <FD_ALL3 timeout="8s" interval="3s"/>
     <FD_SOCK2/>
     <VERIFY_SUSPECT/>
     <!-- Possibly use a second FRAG2 if the public/private keys added in ASYM_ENCRYPT to the payload make the message too big -->
@@ -22,5 +22,5 @@
     <UNICAST3/>
     <pbcast.STABLE/>
     <FRAG2/>
-    <pbcast.GMS join_timeout="2000" />
+    <pbcast.GMS join_timeout="2s" />
 </config>
diff --git a/conf/asym-ssl.xml b/conf/asym-ssl.xml
@@ -26,7 +26,7 @@
     <pbcast.NAKACK2 use_mcast_xmit="false"/>
     <UNICAST3/>
     <pbcast.STABLE/>
-    <pbcast.GMS join_timeout="2000"/>
+    <pbcast.GMS join_timeout="2s"/>
     <UFC/>
     <MFC/>
     <FRAG2/>

diff --git a/conf/comment-test.xml b/conf/comment-test.xml
@@ -12,20 +12,20 @@
          <!--mcast_port="${jgroups.udp.mcast_port:45588}"-->
          <!--thread_pool.min_threads="0"
          thread_pool.max_threads="200"--> <!-- weird XML shit but JGroups is happy to eat it:-) -->
-         thread_pool.keep_alive_time="30000"/>
+         thread_pool.keep_alive_time="30s"/>
     <RED/>
     <LOCAL_PING />
-    <MERGE3 max_interval="30000"
-            min_interval="10000"/>
+    <MERGE3 max_interval="30s"
+            min_interval="10s"/>
     <!--
     <FD_SOCK2/>
     <FD_ALL3/>
     -->
-    <VERIFY_SUSPECT2 timeout="1500"  />
+    <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
-    <pbcast.NAKACK2 xmit_interval="500"/>
-    <UNICAST3 xmit_interval="500" />
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <pbcast.NAKACK2 xmit_interval="0.5s"/>
+    <UNICAST3 xmit_interval="0.5s" />
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
     <pbcast.GMS print_local_addr="true" join_timeout="5"/>
 

diff --git a/conf/encrypt.xml b/conf/encrypt.xml
@@ -6,7 +6,7 @@
     <UDP />
     <PING/>
     <MERGE3/>
-    <FD_ALL3 timeout="8000" interval="3000"/>
+    <FD_ALL3 timeout="8s" interval="3s"/>
     <FD_SOCK2/>
     <VERIFY_SUSPECT/>
 

diff --git a/conf/fast.xml b/conf/fast.xml
@@ -15,19 +15,19 @@
          mcast_port="${jgroups.udp.mcast_port:45588}"
          thread_pool.min_threads="2"
          thread_pool.max_threads="200"
-         thread_pool.keep_alive_time="5000"/>
+         thread_pool.keep_alive_time="5s"/>
     <RED/>
     <PING />
-    <MERGE3 max_interval="30000"
-            min_interval="10000"/>
+    <MERGE3 max_interval="30s"
+            min_interval="10s"/>
     <FD_SOCK2/>
     <FD_ALL3/>
-    <VERIFY_SUSPECT timeout="1500"  />
-    <pbcast.NAKACK2 xmit_interval="500"/>
-    <UNICAST3 xmit_interval="500"/>
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <VERIFY_SUSPECT timeout="1.5s"  />
+    <pbcast.NAKACK2 xmit_interval="0.5s"/>
+    <UNICAST3 xmit_interval="0.5s"/>
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="8m"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="3000"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="3s"/>
     <UFC max_credits="2M"
          min_threshold="0.4"/>
     <MFC max_credits="2M"

diff --git a/conf/fork.xml b/conf/fork.xml
@@ -10,9 +10,9 @@
     <MERGE3 />
     <FD_SOCK/>
     <FD_ALL/>
-    <VERIFY_SUSPECT timeout="1500"  />
-    <pbcast.NAKACK2 xmit_interval="500"/>
-    <UNICAST3 xmit_interval="500"/>
+    <VERIFY_SUSPECT timeout="1.5s"  />
+    <pbcast.NAKACK2 xmit_interval="0.5s"/>
+    <UNICAST3 xmit_interval="0.5s"/>
     <pbcast.STABLE />
     <pbcast.GMS print_local_addr="true" join_timeout="1000"/>
     <UFC />

diff --git a/conf/jdbc-hsql.xml b/conf/jdbc-hsql.xml
@@ -10,7 +10,7 @@ JDBC_PING2 for hsqldb
             port_range="50"
             recv_buf_size="150000"
             send_buf_size="640000"
-            sock_conn_timeout="300"
+            sock_conn_timeout="300ms"
     />
 
     <!-- Uncomment attributes 'insert_sp' and 'call_insert_sp' if you want to use stored procedures -->
@@ -34,22 +34,22 @@ JDBC_PING2 for hsqldb
             call_insert_sp="call deleteAndInsert(?,?,?,?,?);"
             -->
     />
-    <MERGE3 min_interval="10000"
-            max_interval="30000"/>
+    <MERGE3 min_interval="10s"
+            max_interval="30s"/>
     <FD_SOCK2/>
-    <FD_ALL3 timeout="40000" interval="5000" />
+    <FD_ALL3 timeout="40s" interval="5s" />
     <VERIFY_SUSPECT2 />
     <pbcast.NAKACK2
             use_mcast_xmit="false"
-            xmit_interval="100"/>
+            xmit_interval="100ms"/>
     <UNICAST3
-            xmit_interval="100"/>
+            xmit_interval="100ms"/>
     <pbcast.STABLE
-            desired_avg_gossip="5000"
+            desired_avg_gossip="5s"
             max_bytes="1000000"/>
     <pbcast.GMS
             print_local_addr="false"
-            join_timeout="1000"
+            join_timeout="1s"
             max_join_attempts="1"/>
     <UFC max_credits="2000000"
          min_threshold="0.40"/>

diff --git a/conf/jdbc-mysql.xml b/conf/jdbc-mysql.xml
@@ -10,11 +10,11 @@
             port_range="50"
             recv_buf_size="150000"
             send_buf_size="640000"
-            sock_conn_timeout="300"
+            sock_conn_timeout="300ms"
             thread_pool.enabled="true"
             thread_pool.min_threads="1"
             thread_pool.max_threads="50"
-            thread_pool.keep_alive_time="60000"
+            thread_pool.keep_alive_time="60s"
     />
 
     <!-- Uncomment attributes 'insert_sp' and 'call_insert_sp' if you want to use stored procedures -->
@@ -48,11 +48,11 @@
     <UNICAST3
             xmit_interval="100"/>
     <pbcast.STABLE
-            desired_avg_gossip="5000"
+            desired_avg_gossip="5s"
             max_bytes="1000000"/>
     <pbcast.GMS
             print_local_addr="false"
-            join_timeout="1000"
+            join_timeout="1s"
             max_join_attempts="1"/>
     <UFC max_credits="2000000"
          min_threshold="0.40"/>

diff --git a/conf/jdbc-pg.xml b/conf/jdbc-pg.xml
@@ -10,7 +10,7 @@
             port_range="50"
             recv_buf_size="150000"
             send_buf_size="640000"
-            sock_conn_timeout="300"
+            sock_conn_timeout="300ms"
     />
 
     <!-- Uncomment attributes 'insert_sp' and 'call_insert_sp' if you want to use stored procedures -->
@@ -36,19 +36,19 @@
     <MERGE3 min_interval="10000"
             max_interval="30000"/>
     <FD_SOCK2/>
-    <FD_ALL3 timeout="40000" interval="5000" />
+    <FD_ALL3 timeout="40s" interval="5s" />
     <VERIFY_SUSPECT2 />
     <pbcast.NAKACK2
             use_mcast_xmit="false"
-            xmit_interval="500"/>
+            xmit_interval="500ms"/>
     <UNICAST3
-            xmit_interval="500"/>
+            xmit_interval="500ms"/>
     <pbcast.STABLE
-            desired_avg_gossip="5000"
+            desired_avg_gossip="5s"
             max_bytes="1000000"/>
     <pbcast.GMS
             print_local_addr="false"
-            join_timeout="1000"
+            join_timeout="1s"
             max_join_attempts="1"/>
     <UFC max_credits="2M"
          min_threshold="0.40"/>

diff --git a/conf/sym-encrypt.xml b/conf/sym-encrypt.xml
@@ -8,7 +8,7 @@
     <UDP />
     <PING/>
     <MERGE3/>
-    <FD_ALL3 timeout="8000" interval="3000"/>
+    <FD_ALL3 timeout="8s" interval="3s"/>
     <FD_SOCK2/>
     <VERIFY_SUSPECT/>
 
@@ -27,5 +27,5 @@
     <AUTH auth_class="org.jgroups.auth.MD5Token"
           auth_value="chris"
           token_hash="MD5"/>
-    <pbcast.GMS join_timeout="2000" />
+    <pbcast.GMS join_timeout="2s" />
 </config>
diff --git a/conf/tcp-low-latency.xml b/conf/tcp-low-latency.xml
@@ -28,16 +28,16 @@
          bundler_type="no-bundler" />
 
     <MPING mcast_addr="224.0.0.5" />
-    <MERGE3 max_interval="120000"
-            min_interval="30000"/>
+    <MERGE3 max_interval="2m"
+            min_interval="30s"/>
     <FD_SOCK />
     <FD_ALL3 />
-    <VERIFY_SUSPECT timeout="1500"  />
+    <VERIFY_SUSPECT timeout="1.5s"  />
     <pbcast.NAKACK2 use_mcast_xmit="false"/>
-    <UNICAST3 conn_close_timeout="60000"/>
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <UNICAST3 conn_close_timeout="1m"/>
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="500"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="500ms"/>
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <UFC max_credits="2M"

diff --git a/conf/tcp-minimal.xml b/conf/tcp-minimal.xml
@@ -30,16 +30,16 @@
              initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
              return_entire_cache="${jgroups.tcpping.return_entire_cache:false}"
              port_range="${jgroups.tcp.port_range:2}"/>
-    <MERGE3 max_interval="120000"
-            min_interval="30000"/>
+    <MERGE3 max_interval="2m"
+            min_interval="30s"/>
     <FD_SOCK />
     <FD_ALL3 />
-    <VERIFY_SUSPECT timeout="1500"  />
-    <pbcast.NAKACK2 xmit_interval="500" use_mcast_xmit="false"/>
+    <VERIFY_SUSPECT timeout="1.5s"  />
+    <pbcast.NAKACK2 xmit_interval="500ms" use_mcast_xmit="false"/>
     <!--UNICAST3 conn_close_timeout="60000"/-->
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="500"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="0.5s"/>
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <FRAG4 frag_size="60K"  />

diff --git a/conf/tcp-nio.xml b/conf/tcp-nio.xml
@@ -17,17 +17,17 @@
     <TCPPING async_discovery="true"
              initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
              port_range="2"/>
-    <MERGE3  min_interval="10000"
-             max_interval="30000"/>
+    <MERGE3  min_interval="10s"
+             max_interval="30s"/>
     <FD_SOCK2/>
-    <FD_ALL3 timeout="30000" />
-    <VERIFY_SUSPECT2 timeout="1500"  />
+    <FD_ALL3 timeout="30s" />
+    <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
     <pbcast.NAKACK2 use_mcast_xmit="false"/>
     <UNICAST3 />
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="2000"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="2s"/>
     <MFC max_credits="2M"
          min_threshold="0.4"/>
     <UFC max_credits="2M"

diff --git a/conf/tcp.xml b/conf/tcp.xml
@@ -23,22 +23,22 @@
              initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800],localhost[7801]}"
              return_entire_cache="${jgroups.tcpping.return_entire_cache:false}"
              port_range="${jgroups.tcp.port_range:2}"/>
-    <MERGE3  min_interval="10000"
-             max_interval="30000"/>
+    <MERGE3  min_interval="10s"
+             max_interval="30s"/>
     <FD_SOCK2/>
-    <FD_ALL3 timeout="40000" interval="5000" />
-    <VERIFY_SUSPECT2 timeout="1500"  />
+    <FD_ALL3 timeout="40s" interval="5s" />
+    <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
     <pbcast.NAKACK2 use_mcast_xmit="false" />
     <UNICAST3 />
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="2000"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="2s"/>
     <MFC max_credits="10M"
          min_threshold="0.4"/>
     <UFC max_credits="10M"
              min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
-    <!--RSVP resend_interval="2000" timeout="10000"/-->
+    <!--RSVP resend_interval="2s" timeout="10s"/-->
     <pbcast.STATE_TRANSFER/>
 </config>
diff --git a/conf/udp.xml b/conf/udp.xml
@@ -12,20 +12,20 @@
          mcast_port="${jgroups.udp.mcast_port:45588}"
          thread_pool.min_threads="0"
          thread_pool.max_threads="200"
-         thread_pool.keep_alive_time="30000"/>
+         thread_pool.keep_alive_time="30s"/>
     <RED/>
     <PING />
-    <MERGE3 max_interval="30000"
-            min_interval="10000"/>
+    <MERGE3 max_interval="30s"
+            min_interval="10s"/>
     <FD_SOCK2/>
     <FD_ALL3/>
-    <VERIFY_SUSPECT2 timeout="1500"  />
+    <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
-    <pbcast.NAKACK2 xmit_interval="500"/>
-    <UNICAST3 xmit_interval="500" />
-    <pbcast.STABLE desired_avg_gossip="50000"
+    <pbcast.NAKACK2 xmit_interval="0.5s"/>
+    <UNICAST3 xmit_interval="0.5s" />
+    <pbcast.STABLE desired_avg_gossip="50s"
                    max_bytes="4M"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="1000"/>
+    <pbcast.GMS print_local_addr="true" join_timeout="1s"/>
     <MFC max_credits="4M"
          min_threshold="0.4"/>
     <UFC max_credits="4M"