ARTEMIS-1371 update JGroups stack files
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/605ab08c Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/605ab08c Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/605ab08c Branch: refs/heads/master Commit: 605ab08c05408b9aa53b716b2165242fc786cc92 Parents: 720469b Author: Justin Bertram <[email protected]> Authored: Thu Aug 24 13:53:24 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Fri Aug 25 22:46:13 2017 -0400 ---------------------------------------------------------------------- .../activemq/server0/test-jgroups-file_ping.xml | 91 ++++++++++---------- .../activemq/server1/test-jgroups-file_ping.xml | 89 +++++++++---------- .../test/resources/test-jgroups-file_ping.xml | 63 +++++++------- 3 files changed, 119 insertions(+), 124 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/605ab08c/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml index 5fb6ab4..f2f64b2 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server0/test-jgroups-file_ping.xml @@ -1,43 +1,43 @@ -<?xml version='1.0'?> <!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> - -<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"> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="urn:org:jgroups" + xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd";> <TCP loopback="true" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" + recv_buf_size="${tcp.recv_buf_size:5M}" + send_buf_size="${tcp.send_buf_size:5M}" + max_bundle_size="64K" max_bundle_timeout="30" - enable_bundling="true" - use_send_queues="false" + use_send_queues="true" sock_conn_timeout="300" + timer_type="new3" + timer.min_threads="4" + timer.max_threads="10" + timer.keep_alive_time="3000" + timer.queue_max_size="500" + thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="10" + thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="run" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="10000" + thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" @@ -45,29 +45,26 @@ under the License. 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"/> + oob_thread_pool.rejection_policy="discard"/> - <!-- a location that can be found by both server's running --> + <!-- a location that can be found by both server's running --> <FILE_PING location="../../file.ping.dir"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> + <MERGE3 min_interval="10000" + max_interval="30000"/> <FD_SOCK/> - <FD timeout="10000" max_tries="5" /> + <FD timeout="3000" max_tries="3" /> <VERIFY_SUSPECT timeout="1500" /> <BARRIER /> - <pbcast.NAKACK - use_mcast_xmit="false" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200" /> + <pbcast.NAKACK2 use_mcast_xmit="false" + discard_delivered_msgs="true"/> + <UNICAST3 /> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - + max_bytes="4M"/> + <pbcast.GMS print_local_addr="true" join_timeout="2000" view_bundling="true"/> - <FC max_credits="2000000" - min_threshold="0.10"/> - <FRAG2 frag_size="60000" /> + <MFC max_credits="2M" + min_threshold="0.4"/> + <FRAG2 frag_size="60K" /> + <!--RSVP resend_interval="2000" timeout="10000"/--> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="0"/> -</config> +</config> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/605ab08c/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml ---------------------------------------------------------------------- diff --git a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml index 1137496..f2f64b2 100644 --- a/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml +++ b/examples/features/clustered/clustered-jgroups/src/main/resources/activemq/server1/test-jgroups-file_ping.xml @@ -1,43 +1,43 @@ -<?xml version='1.0'?> <!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --> - -<config xmlns="urn:org:jgroups" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.0.xsd";> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="urn:org:jgroups" + xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd";> <TCP loopback="true" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" + recv_buf_size="${tcp.recv_buf_size:5M}" + send_buf_size="${tcp.send_buf_size:5M}" + max_bundle_size="64K" max_bundle_timeout="30" - enable_bundling="true" - use_send_queues="false" + use_send_queues="true" sock_conn_timeout="300" + timer_type="new3" + timer.min_threads="4" + timer.max_threads="10" + timer.keep_alive_time="3000" + timer.queue_max_size="500" + thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="10" + thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="run" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="10000" + thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" @@ -45,29 +45,26 @@ under the License. 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"/> + oob_thread_pool.rejection_policy="discard"/> <!-- a location that can be found by both server's running --> <FILE_PING location="../../file.ping.dir"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> + <MERGE3 min_interval="10000" + max_interval="30000"/> <FD_SOCK/> - <FD timeout="10000" max_tries="5" /> + <FD timeout="3000" max_tries="3" /> <VERIFY_SUSPECT timeout="1500" /> <BARRIER /> - <pbcast.NAKACK - use_mcast_xmit="false" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200" /> + <pbcast.NAKACK2 use_mcast_xmit="false" + discard_delivered_msgs="true"/> + <UNICAST3 /> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - + max_bytes="4M"/> + <pbcast.GMS print_local_addr="true" join_timeout="2000" view_bundling="true"/> - <FC max_credits="2000000" - min_threshold="0.10"/> - <FRAG2 frag_size="60000" /> + <MFC max_credits="2M" + min_threshold="0.4"/> + <FRAG2 frag_size="60K" /> + <!--RSVP resend_interval="2000" timeout="10000"/--> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="0"/> -</config> +</config> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/605ab08c/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml b/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml index 0d115bc..86b91fd 100644 --- a/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml +++ b/tests/integration-tests/src/test/resources/test-jgroups-file_ping.xml @@ -14,26 +14,30 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="urn:org:jgroups" + xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd";> <TCP loopback="true" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" + recv_buf_size="${tcp.recv_buf_size:5M}" + send_buf_size="${tcp.send_buf_size:5M}" + max_bundle_size="64K" max_bundle_timeout="30" - enable_bundling="true" - use_send_queues="false" + use_send_queues="true" sock_conn_timeout="300" + timer_type="new3" + timer.min_threads="4" + timer.max_threads="10" + timer.keep_alive_time="3000" + timer.queue_max_size="500" + thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="10" + thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="run" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="10000" + thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" @@ -41,28 +45,25 @@ 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"/> + oob_thread_pool.rejection_policy="discard"/> <FILE_PING location="./target/tmp/amqtest.ping.dir"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> + <MERGE3 min_interval="10000" + max_interval="30000"/> <FD_SOCK/> - <FD timeout="10000" max_tries="5" /> + <FD timeout="3000" max_tries="3" /> <VERIFY_SUSPECT timeout="1500" /> <BARRIER /> - <pbcast.NAKACK - use_mcast_xmit="false" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200" /> + <pbcast.NAKACK2 use_mcast_xmit="false" + discard_delivered_msgs="true"/> + <UNICAST3 /> <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - + max_bytes="4M"/> + <pbcast.GMS print_local_addr="true" join_timeout="2000" view_bundling="true"/> - <FC max_credits="2000000" - min_threshold="0.10"/> - <FRAG2 frag_size="60000" /> + <MFC max_credits="2M" + min_threshold="0.4"/> + <FRAG2 frag_size="60K" /> + <!--RSVP resend_interval="2000" timeout="10000"/--> <pbcast.STATE_TRANSFER/> - <pbcast.FLUSH timeout="0"/> -</config> +</config> \ No newline at end of file
