[infinispan-commits] Infinispan SVN: r651 - in trunk/core/src/test/resources/stacks: tcp_mping and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Tue Aug 11 10:33:04 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-08-11 10:33:03 -0400 (Tue, 11 Aug 2009)
New Revision: 651
Modified:
trunk/core/src/test/resources/stacks/tcp.xml
trunk/core/src/test/resources/stacks/tcp_mping/tcp1.xml
trunk/core/src/test/resources/stacks/tcp_mping/tcp2.xml
trunk/core/src/test/resources/stacks/udp.xml
Log:
Removed deprecated attributes
Modified: trunk/core/src/test/resources/stacks/tcp.xml
===================================================================
--- trunk/core/src/test/resources/stacks/tcp.xml 2009-08-11 12:42:41 UTC (rev 650)
+++ trunk/core/src/test/resources/stacks/tcp.xml 2009-08-11 14:33:03 UTC (rev 651)
@@ -1,67 +1,66 @@
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <TCP bind_port="7800"
- loopback="true"
- port_range="30"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
+ <TCP bind_port="7800"
+ loopback="true"
+ port_range="30"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <TCPPING timeout="3000"
- initial_hosts="localhost[7800],localhost[7801]}"
- port_range="5"
- num_initial_members="3"/>
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <TCPPING timeout="3000"
+ initial_hosts="localhost[7800],localhost[7801]}"
+ port_range="5"
+ num_initial_members="3"/>
+
<!--<MPING bind_addr="127.0.0.1" break_on_coord_rsp="true"-->
- <!--mcast_addr="230.8.8.8" mcast_port="17890" ip_ttl="2"-->
- <!--num_initial_members="3"/>-->
-
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="3000" max_tries="3" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="7000"
- shun="false" view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
+ <!--mcast_addr="230.8.8.8" mcast_port="17890" ip_ttl="2"-->
+ <!--num_initial_members="3"/>-->
+
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="3000" max_tries="3"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="false"/>
+ <UNICAST timeout="300,600,1200"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="7000" view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
Modified: trunk/core/src/test/resources/stacks/tcp_mping/tcp1.xml
===================================================================
--- trunk/core/src/test/resources/stacks/tcp_mping/tcp1.xml 2009-08-11 12:42:41 UTC (rev 650)
+++ trunk/core/src/test/resources/stacks/tcp_mping/tcp1.xml 2009-08-11 14:33:03 UTC (rev 651)
@@ -1,67 +1,66 @@
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <TCP bind_port="7800"
- loopback="true"
- port_range="30"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
+ <TCP bind_port="7800"
+ loopback="true"
+ port_range="30"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <!--<TCPPING timeout="3000"-->
- <!--initial_hosts="localhost[7800],localhost[7801]}"-->
- <!--port_range="1"-->
- <!--num_initial_members="3"/>-->
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <!--<TCPPING timeout="3000"-->
+ <!--initial_hosts="localhost[7800],localhost[7801]}"-->
+ <!--port_range="1"-->
+ <!--num_initial_members="3"/>-->
+
<MPING bind_addr="127.0.0.1" break_on_coord_rsp="true"
mcast_addr="228.10.10.5" mcast_port="43589" ip_ttl="2"
num_initial_members="3"/>
-
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="3000" max_tries="3" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="7000"
- shun="false" view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
+
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="3000" max_tries="3"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="false"/>
+ <UNICAST timeout="300,600,1200"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="7000" view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
Modified: trunk/core/src/test/resources/stacks/tcp_mping/tcp2.xml
===================================================================
--- trunk/core/src/test/resources/stacks/tcp_mping/tcp2.xml 2009-08-11 12:42:41 UTC (rev 650)
+++ trunk/core/src/test/resources/stacks/tcp_mping/tcp2.xml 2009-08-11 14:33:03 UTC (rev 651)
@@ -1,67 +1,66 @@
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <TCP bind_port="7800"
- loopback="true"
- port_range="30"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- enable_bundling="false"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
-
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
+ <TCP bind_port="7800"
+ loopback="true"
+ port_range="30"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ enable_bundling="false"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
-
- <!--<TCPPING timeout="3000"-->
- <!--initial_hosts="localhost[7800],localhost[7801]}"-->
- <!--port_range="1"-->
- <!--num_initial_members="3"/>-->
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
+
+ <!--<TCPPING timeout="3000"-->
+ <!--initial_hosts="localhost[7800],localhost[7801]}"-->
+ <!--port_range="1"-->
+ <!--num_initial_members="3"/>-->
+
<MPING bind_addr="127.0.0.1" break_on_coord_rsp="true"
mcast_addr="228.10.10.6" mcast_port="43590" ip_ttl="2"
num_initial_members="3"/>
-
- <MERGE2 max_interval="30000"
- min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="3000" max_tries="3" shun="true"/>
- <VERIFY_SUSPECT timeout="1500" />
- <pbcast.NAKACK
- use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200" />
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="7000"
- shun="false" view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000" />
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
+
+ <MERGE2 max_interval="30000"
+ min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="3000" max_tries="3"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="false"/>
+ <UNICAST timeout="300,600,1200"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="7000" view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
Modified: trunk/core/src/test/resources/stacks/udp.xml
===================================================================
--- trunk/core/src/test/resources/stacks/udp.xml 2009-08-11 12:42:41 UTC (rev 650)
+++ trunk/core/src/test/resources/stacks/udp.xml 2009-08-11 14:33:03 UTC (rev 651)
@@ -1,7 +1,7 @@
<config xmlns="urn:org:jgroups"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:org:jgroups file:schema/JGroups-2.8.xsd">
- <UDP
+ <UDP
mcast_addr="${jgroups.udp.mcast_addr:228.10.10.10}"
mcast_port="${jgroups.udp.mcast_port:45588}"
tos="8"
@@ -16,7 +16,7 @@
ip_ttl="${jgroups.udp.ip_ttl:2}"
enable_bundling="true"
enable_diagnostics="true"
-
+
thread_naming_pattern="pl"
thread_pool.enabled="true"
@@ -35,30 +35,28 @@
oob_thread_pool.queue_max_size="100"
oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="1000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="3000" max_tries="3" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_stats_for_retransmission="false"
- exponential_backoff="150"
- use_mcast_xmit="true" gc_lag="0"
- retransmit_timeout="50,300,600,1200"
- discard_delivered_msgs="false"/>
- <UNICAST timeout="300,600,1200"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="3000"
- shun="false"
- view_bundling="true"/>
- <FC max_credits="500000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER />
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
+ <PING timeout="1000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="3000" max_tries="3"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_stats_for_retransmission="false"
+ exponential_backoff="150"
+ use_mcast_xmit="true" gc_lag="0"
+ retransmit_timeout="50,300,600,1200"
+ discard_delivered_msgs="false"/>
+ <UNICAST timeout="300,600,1200"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
+ <FC max_credits="500000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
</config>
More information about the infinispan-commits
mailing list