update to jgroups 3.2 configuration, use TCPPING for cluster pinging.…

… configured modeshape-level clustering too. added java properties for using different jgroup configurations.
fcrepo4-archive · Feb 1, 2013 · ab77635 · ab77635
1 parent f529a81
commit ab77635
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 2,971 deletions.
diff --git a/src/main/resources/infinispan_configuration.xml b/src/main/resources/infinispan_configuration.xml
@@ -6,7 +6,7 @@
       <!-- Defines the global settings shared by all caches -->
       <transport>
          <properties>
-            <property name="configurationFile" value="jgroups-tcp.xml"/>
+            <property name="configurationFile" value="${fcrepo.modeshape.ispn.configuration:jgroups-infinispan.xml}"/>
          </properties>
       </transport>
    </global>

diff --git a/src/main/resources/jgroups-infinispan.xml b/src/main/resources/jgroups-infinispan.xml
@@ -0,0 +1,91 @@
+<!--
+  ~ JBoss, Home of Professional Open Source
+  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
+  ~ contributors as indicated by the @author tags. All rights reserved.
+  ~ See the copyright.txt in the distribution for a full listing of
+  ~ individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<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.2.xsd">
+    <TCP
+            bind_addr="${jgroups.tcp.address:127.0.0.1}"
+            bind_port="${jgroups.tcp.port:7800}"
+            loopback="true"
+            port_range="30"
+            recv_buf_size="20m"
+            send_buf_size="640k"
+            max_bundle_size="64000"
+            max_bundle_timeout="30"
+            enable_bundling="true"
+            use_send_queues="true"
+            enable_diagnostics="false"
+            bundler_type="old"
+
+            thread_naming_pattern="pl"
+
+            thread_pool.enabled="true"
+            thread_pool.min_threads="2"
+            thread_pool.max_threads="30"
+            thread_pool.keep_alive_time="60000"
+            thread_pool.queue_enabled="true"
+            thread_pool.queue_max_size="100"
+            thread_pool.rejection_policy="Discard"
+
+            oob_thread_pool.enabled="true"
+            oob_thread_pool.min_threads="2"
+            oob_thread_pool.max_threads="30"
+            oob_thread_pool.keep_alive_time="60000"
+            oob_thread_pool.queue_enabled="false"
+            oob_thread_pool.queue_max_size="100"
+            oob_thread_pool.rejection_policy="Discard"
+            />
+
+    <!-- Ergonomics, new in JGroups 2.11, are disabled by default in TCPPING until JGRP-1253 is resolved -->
+    <TCPPING timeout="3000"
+             initial_hosts="${jgroups.tcpping.initial_hosts:localhost[7800]}"
+             port_range="5"
+             num_initial_members="1"
+             ergonomics="false"
+         />
+
+    <MERGE2 max_interval="30000" min_interval="10000"/>
+    <FD_SOCK/>
+    <FD timeout="3000" max_tries="3"/>
+    <VERIFY_SUSPECT timeout="1500"/>
+    <pbcast.NAKACK2 use_mcast_xmit="false"
+                    xmit_interval="1000"
+                    xmit_table_num_rows="100"
+                    xmit_table_msgs_per_row="10000"
+                    xmit_table_max_compaction_time="10000"
+                    max_msg_batch_size="100"/>
+
+    <UNICAST2 stable_interval="5000"
+              xmit_interval="500"
+              max_bytes="1m"
+              xmit_table_num_rows="20"
+              xmit_table_msgs_per_row="10000"
+              xmit_table_max_compaction_time="10000"
+              max_msg_batch_size="100"/>
+    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
+    <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
+    <UFC max_credits="200k" min_threshold="0.20"/>
+    <MFC max_credits="200k" min_threshold="0.20"/>
+    <FRAG2 frag_size="60000"/>
+    <RSVP timeout="60000" resend_interval="500" ack_on_delivery="false" />
+</config>
diff --git a/src/main/resources/jgroups-modeshape.xml b/src/main/resources/jgroups-modeshape.xml
@@ -0,0 +1,91 @@
+<!--
+  ~ JBoss, Home of Professional Open Source
+  ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
+  ~ contributors as indicated by the @author tags. All rights reserved.
+  ~ See the copyright.txt in the distribution for a full listing of
+  ~ individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<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.2.xsd">
+    <TCP
+            bind_addr="${jgroups.modeshape.tcp.address:127.0.0.1}"
+            bind_port="${jgroups.modeshape.tcp.port:7850}"
+            loopback="true"
+            port_range="30"
+            recv_buf_size="20m"
+            send_buf_size="640k"
+            max_bundle_size="64000"
+            max_bundle_timeout="30"
+            enable_bundling="true"
+            use_send_queues="true"
+            enable_diagnostics="false"
+            bundler_type="old"
+
+            thread_naming_pattern="pl"
+
+            thread_pool.enabled="true"
+            thread_pool.min_threads="2"
+            thread_pool.max_threads="30"
+            thread_pool.keep_alive_time="60000"
+            thread_pool.queue_enabled="true"
+            thread_pool.queue_max_size="100"
+            thread_pool.rejection_policy="Discard"
+
+            oob_thread_pool.enabled="true"
+            oob_thread_pool.min_threads="2"
+            oob_thread_pool.max_threads="30"
+            oob_thread_pool.keep_alive_time="60000"
+            oob_thread_pool.queue_enabled="false"
+            oob_thread_pool.queue_max_size="100"
+            oob_thread_pool.rejection_policy="Discard"
+            />
+
+    <!-- Ergonomics, new in JGroups 2.11, are disabled by default in TCPPING until JGRP-1253 is resolved -->
+    <TCPPING timeout="3000"
+             initial_hosts="${jgroups.modeshape.tcpping.initial_hosts:localhost[7850]}"
+             port_range="5"
+             num_initial_members="1"
+             ergonomics="false"
+            />
+
+    <MERGE2 max_interval="30000" min_interval="10000"/>
+    <FD_SOCK/>
+    <FD timeout="3000" max_tries="3"/>
+    <VERIFY_SUSPECT timeout="1500"/>
+    <pbcast.NAKACK2 use_mcast_xmit="false"
+                    xmit_interval="1000"
+                    xmit_table_num_rows="100"
+                    xmit_table_msgs_per_row="10000"
+                    xmit_table_max_compaction_time="10000"
+                    max_msg_batch_size="100"/>
+
+    <UNICAST2 stable_interval="5000"
+              xmit_interval="500"
+              max_bytes="1m"
+              xmit_table_num_rows="20"
+              xmit_table_msgs_per_row="10000"
+              xmit_table_max_compaction_time="10000"
+              max_msg_batch_size="100"/>
+    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
+    <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="true"/>
+    <UFC max_credits="200k" min_threshold="0.20"/>
+    <MFC max_credits="200k" min_threshold="0.20"/>
+    <FRAG2 frag_size="60000"/>
+    <RSVP timeout="60000" resend_interval="500" ack_on_delivery="false" />
+</config>
diff --git a/src/main/resources/jgroups.xml b/src/main/resources/jgroups.xml
diff --git a/src/main/resources/my_repository.json b/src/main/resources/my_repository.json
@@ -6,6 +6,10 @@
         "default" : "fedora",
         "allowCreation" : true
     },
+    "clustering" : {
+        "clusterName" : "modeshape",
+        "channelConfiguration" : "${fcrepo.modeshape.jgroups.configuration:jgroups-modeshape.xml}"
+    },
     "storage" : {
         "cacheName" : "FedoraRepository",
         "cacheConfiguration" : "infinispan_configuration.xml",