Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

JGRP-2811 Support time units parsing for property values #812

Closed
wants to merge 1 commit into from
Closed

JGRP-2811 Support time units parsing for property values #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/asym-encrypt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -22,5 +22,5 @@
<UNICAST3/>
<pbcast.STABLE/>
<FRAG2/>
<pbcast.GMS join_timeout="2000" />
<pbcast.GMS join_timeout="2s" />
</config>
2 changes: 1 addition & 1 deletion conf/asym-ssl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
Expand Down
14 changes: 7 additions & 7 deletions conf/comment-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
2 changes: 1 addition & 1 deletion conf/encrypt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<UDP />
<PING/>
<MERGE3/>
<FD_ALL3 timeout="8000" interval="3000"/>
<FD_ALL3 timeout="8s" interval="3s"/>
<FD_SOCK2/>
<VERIFY_SUSPECT/>

Expand Down
16 changes: 8 additions & 8 deletions conf/fast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions conf/fork.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
16 changes: 8 additions & 8 deletions conf/jdbc-hsql.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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"/>
Expand Down
8 changes: 4 additions & 4 deletions conf/jdbc-mysql.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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"/>
Expand Down
12 changes: 6 additions & 6 deletions conf/jdbc-pg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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"/>
Expand Down
4 changes: 2 additions & 2 deletions conf/sym-encrypt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<UDP />
<PING/>
<MERGE3/>
<FD_ALL3 timeout="8000" interval="3000"/>
<FD_ALL3 timeout="8s" interval="3s"/>
<FD_SOCK2/>
<VERIFY_SUSPECT/>

Expand All @@ -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>
12 changes: 6 additions & 6 deletions conf/tcp-low-latency.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions conf/tcp-minimal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
12 changes: 6 additions & 6 deletions conf/tcp-nio.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions conf/tcp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 8 additions & 8 deletions conf/udp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading