ISPN-6402 Default GMS.join_timeout is too long

* Change the production default to 5000ms, and the tests to 2000ms. * Set the jgroups.join_timeout property for Arquillian/JCache tests
infinispan · Mar 31, 2016 · bd39c65 · bd39c65
1 parent 3e09ed2
commit bd39c65
Show file tree

Hide file tree

Showing 31 changed files with 337 additions and 163 deletions.
diff --git a/core/src/main/resources/default-configs/default-jgroups-ec2.xml b/core/src/main/resources/default-configs/default-jgroups-ec2.xml
@@ -61,7 +61,7 @@
                   max_bytes="1M"
    />
    <pbcast.GMS print_local_addr="false"
-               join_timeout="15000"
+               join_timeout="${jgroups.join_timeout:5000}"
    />
    <MFC max_credits="2m" 
         min_threshold="0.40"

diff --git a/core/src/main/resources/default-configs/default-jgroups-google.xml b/core/src/main/resources/default-configs/default-jgroups-google.xml
@@ -59,7 +59,7 @@
                   max_bytes="1M"
    />
    <pbcast.GMS print_local_addr="false"
-               join_timeout="15000"
+               join_timeout="${jgroups.join_timeout:5000}"
    />
    <MFC max_credits="2m" 
         min_threshold="0.40"

diff --git a/core/src/main/resources/default-configs/default-jgroups-tcp.xml b/core/src/main/resources/default-configs/default-jgroups-tcp.xml
@@ -59,7 +59,7 @@
                   max_bytes="1M"
    />
    <pbcast.GMS print_local_addr="false"
-               join_timeout="15000"
+               join_timeout="${jgroups.join_timeout:5000}"
    />
    <MFC max_credits="2m" 
         min_threshold="0.40"

diff --git a/core/src/main/resources/default-configs/default-jgroups-udp.xml b/core/src/main/resources/default-configs/default-jgroups-udp.xml
@@ -58,7 +58,7 @@
                   max_bytes="1M"
    />
    <pbcast.GMS print_local_addr="false"
-               join_timeout="15000"
+               join_timeout="${jgroups.join_timeout:5000}"
    />
    <UFC max_credits="2m" 
         min_threshold="0.40"

diff --git a/core/src/test/resources/configs/xsite/bridge.xml b/core/src/test/resources/configs/xsite/bridge.xml
@@ -61,7 +61,7 @@
 
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="8m"/>
-    <pbcast.GMS print_local_addr="false" join_timeout="3000"
+    <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}"
                 view_bundling="false"/>
 
     <MFC max_credits="2M"

diff --git a/core/src/test/resources/stacks/tcp.xml b/core/src/test/resources/stacks/tcp.xml
@@ -73,7 +73,7 @@
               conn_expiry_timeout="0"/>
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
    <tom.TOA/> <!-- the Total Order Anycast is only needed for total order transactions (in distributed mode)-->
 
    <MFC max_credits="2m" min_threshold="0.40"/>

diff --git a/core/src/test/resources/stacks/tcp_mping/tcp1.xml b/core/src/test/resources/stacks/tcp_mping/tcp1.xml
@@ -62,7 +62,7 @@
    <RSVP />           
    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                   max_bytes="400000"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="7000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
    <tom.TOA/> <!-- the Total Order Anycast is only needed for total order transactions (in distributed mode)-->
    <FC max_credits="2m"
        min_threshold="0.40"/>

diff --git a/core/src/test/resources/stacks/tcp_mping/tcp2.xml b/core/src/test/resources/stacks/tcp_mping/tcp2.xml
@@ -62,7 +62,7 @@
    <RSVP />
    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                   max_bytes="400000"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="7000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
    <tom.TOA/> <!-- the Total Order Anycast is only needed for total order transactions (in distributed mode)-->
    <FC max_credits="2m"
        min_threshold="0.40"/>

diff --git a/core/src/test/resources/stacks/udp.xml b/core/src/test/resources/stacks/udp.xml
@@ -56,7 +56,7 @@
          conn_expiry_timeout="0"/>
 
    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
    <tom.TOA/> <!-- the Total Order Anycast is only needed for total order transactions (in distributed mode)-->
 
    <UFC max_credits="2m" min_threshold="0.40"/>

diff --git a/demos/distexec/src/main/release/etc/config-samples/distexec-demo/jgroups-s3_ping-aws.xml b/demos/distexec/src/main/release/etc/config-samples/distexec-demo/jgroups-s3_ping-aws.xml
@@ -11,7 +11,7 @@
                   discard_delivered_msgs="true"/>
    <UNICAST3 conn_expiry_timeout="0"/>
    <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
-   <pbcast.GMS print_local_addr="true" join_timeout="60000" view_bundling="true"/>
+   <pbcast.GMS print_local_addr="true" join_timeout="${jgroups.join_timeout:5000}" view_bundling="true"/>
    <FC max_credits="2m" min_threshold="0.40"/>
    <FRAG2 frag_size="60000"/>
    <pbcast.STREAMING_STATE_TRANSFER/>

diff --git a/demos/gui/src/main/release/etc/config/jgroups-relay1.xml b/demos/gui/src/main/release/etc/config/jgroups-relay1.xml
@@ -62,7 +62,7 @@
     <UNICAST3 conn_expiry_timeout="0"/>
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="1000000"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="5000"
+    <pbcast.GMS print_local_addr="true" join_timeout="${jgroups.join_timeout:5000}"
                 max_bundling_time="200"
                 view_bundling="true"/>
     <FC max_credits="2M"

diff --git a/demos/gui/src/main/release/etc/config/jgroups-relay2.xml b/demos/gui/src/main/release/etc/config/jgroups-relay2.xml
@@ -63,7 +63,7 @@
     <UNICAST3 conn_expiry_timeout="0"/>
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="1000000"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="5000"
+    <pbcast.GMS print_local_addr="true" join_timeout="${jgroups.join_timeout:5000}"
                 max_bundling_time="200"
                 view_bundling="true"/>
     <FC max_credits="2M"

diff --git a/demos/gui/src/main/release/etc/config/jgroups-tcp.xml b/demos/gui/src/main/release/etc/config/jgroups-tcp.xml
@@ -63,7 +63,7 @@
 
     <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
                    max_bytes="10m"/>
-    <pbcast.GMS print_local_addr="true" join_timeout="5000"
+    <pbcast.GMS print_local_addr="true" join_timeout="${jgroups.join_timeout:5000}"
                 max_bundling_time="30"
                 view_bundling="true"/>
     <MFC max_credits="2M"

diff --git a/integrationtests/all-remote-it/src/test/resources/arquillian.xml b/integrationtests/all-remote-it/src/test/resources/arquillian.xml
@@ -9,14 +9,21 @@
             <configuration>
                 <property name="jbossHome">${project.build.directory}/node1/infinispan-server-${project.version}</property>
                 <property name="serverConfig">clustered.xml</property>
-                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -Djboss.server.default.config=clustered.xml -Djboss.node.name=node1</property>
+                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true
+                    -Djgroups.bind_addr=127.0.0.1 -Djboss.server.default.config=clustered.xml
+                    -Djboss.node.name=node1 -Djgroups.join_timeout=2000
+                </property>
             </configuration>
         </container>
         <container qualifier="container-2" mode="manual">
             <configuration>
                 <property name="jbossHome">${project.build.directory}/node2/infinispan-server-${project.version}</property>
                 <property name="serverConfig">clustered.xml</property>
-                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -Djboss.server.default.config=clustered.xml -Djboss.node.name=node2 -Djboss.socket.binding.port-offset=10000</property>
+                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true
+                    -Djgroups.bind_addr=127.0.0.1 -Djboss.server.default.config=clustered.xml
+                    -Djboss.node.name=node2 -Djboss.socket.binding.port-offset=10000
+                    -Djgroups.join_timeout=2000
+                </property>
                 <property name="managementPort">19990</property>
             </configuration>
         </container>

diff --git a/integrationtests/as-integration-client/src/test/resources/arquillian.xml b/integrationtests/as-integration-client/src/test/resources/arquillian.xml
@@ -18,7 +18,9 @@
             <property name="serverConfig">standalone-test.xml</property>
             <!-- To debug the Arquillian managed application server: -->
             <!-- property name="javaVmArguments">-Djboss.node.name=remote-client -Djboss.socket.binding.port-offset=100 -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Xmx512m</property -->
-            <property name="javaVmArguments">-Djboss.node.name=remote-client -Djboss.socket.binding.port-offset=100 -Xmx512m</property>
+            <property name="javaVmArguments">-Djboss.node.name=remote-client
+                -Djboss.socket.binding.port-offset=100 -Xmx512m -Djgroups.join_timeout=2000
+            </property>
             <property name="managementPort">10090</property>
         </configuration>
     </container>

diff --git a/integrationtests/as-integration-embedded/src/test/resources/arquillian.xml b/integrationtests/as-integration-embedded/src/test/resources/arquillian.xml
@@ -10,15 +10,19 @@
         <container qualifier="container.active-1" default="true">
             <configuration>
                 <property name="jbossHome">${basedir}/target/node1/wildfly-${version.org.wildfly}</property>
-                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>
+                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true
+                    -Djgroups.bind_addr=127.0.0.1 -Djgroups.join_timeout=2000
+                </property>
                 <!-- To debug the Arquillian managed application server: -->
                 <!-- property name="javaVmArguments">-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y -Xmx512m -Dorg.jboss.remoting-jmx.timeout=300  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property-->
             </configuration>
         </container>
         <container qualifier="container.active-2">
             <configuration>
                 <property name="jbossHome">${basedir}/target/node2/wildfly-${version.org.wildfly}</property>
-                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>
+                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m
+                    -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -Djgroups.join_timeout=2000
+                </property>
                 <property name="managementPort">19990</property>
             </configuration>
         </container>

diff --git a/integrationtests/as-lucene-directory/src/test/resources/arquillian.xml b/integrationtests/as-lucene-directory/src/test/resources/arquillian.xml
@@ -12,7 +12,9 @@
                 <property name="jbossHome">${basedir}/target/node1/wildfly-${version.org.wildfly}</property>
                 <!-- Needed for JMS tests -->
                 <property name="serverConfig">standalone-full-testqueues.xml</property>
-                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -XX:+IgnoreUnrecognizedVMOptions</property>
+                <property name="javaVmArguments">-Xmx512m -Djava.net.preferIPv4Stack=true
+                    -Djgroups.bind_addr=127.0.0.1 -Djgroups.join_timeout=2000 -XX:+IgnoreUnrecognizedVMOptions
+                </property>
                 <!-- To debug the Arquillian managed application server: -->
                 <!--<property name="javaVmArguments">-Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y -Xmx512m -Dorg.jboss.remoting-jmx.timeout=300  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>-->
             </configuration>
@@ -23,7 +25,10 @@
                 <property name="jbossHome">${basedir}/target/node2/wildfly-${version.org.wildfly}</property>
                 <!-- Needed for JMS tests -->
                 <property name="serverConfig">standalone-full-testqueues.xml</property>
-                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1 -XX:+IgnoreUnrecognizedVMOptions</property>
+                <property name="javaVmArguments">-Djboss.socket.binding.port-offset=10000 -Xmx512m
+                    -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1
+                    -Djgroups.join_timeout=2000 -XX:+IgnoreUnrecognizedVMOptions
+                </property>
                 <property name="managementPort">19990</property>
                 <!--<property name="javaVmArguments">-Xrunjdwp:transport=dt_socket,address=5006,server=y,suspend=y -Xmx512m -Dorg.jboss.remoting-jmx.timeout=300  -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1</property>-->
             </configuration>

diff --git a/integrationtests/security-it/src/test/resources/arquillian.xml b/integrationtests/security-it/src/test/resources/arquillian.xml
@@ -17,7 +17,7 @@
             <!--Needed for security domain configuration-->
             <property name="serverConfig">standalone.xml</property>
             <property name="javaVmArguments">
-                -Djboss.node.name=testnode
+                -Djboss.node.name=testnode -Djgroups.join_timeout=2000
             </property>
             <property name="managementPort">9990</property>
          </configuration>
@@ -33,10 +33,11 @@
             <property name="serverConfig">standalone-ha.xml</property>
             <property name="javaVmArguments">-Djboss.node.name=node0
                                              -Djboss.socket.binding.port-offset=100 
-                                             -Djava.net.preferIPv4Stack=true 
-                                             -Dsasl.username=test_user 
+                                             -Djava.net.preferIPv4Stack=true
+                                             -Dsasl.username=test_user
                                              -Dsasl.password=test_password
                                              -Dsasl.realm=test_realm
+                                             -Djgroups.join_timeout=2000
             </property>
             <property name="managementAddress">${node0.mgmt.addr:127.0.0.1}</property>
             <property name="managementPort">10090</property>
@@ -71,10 +72,11 @@
             <property name="serverConfig">standalone-ha.xml</property>
             <property name="javaVmArguments">-Djboss.node.name=node1 
                                              -Djboss.socket.binding.port-offset=200 
-                                             -Djava.net.preferIPv4Stack=true 
-                                             -Dsasl.username=test_user 
-                                             -Dsasl.password=wrong_password 
+                                             -Djava.net.preferIPv4Stack=true
+                                             -Dsasl.username=test_user
+                                             -Dsasl.password=wrong_password
                                              -Dsasl.realm=test_realm
+                                             -Djgroups.join_timeout=2000
             </property>
             <property name="managementPort">10190</property>
          </configuration>
@@ -90,10 +92,11 @@
             <property name="serverConfig">standalone-ha.xml</property>
             <property name="javaVmArguments">-Djboss.node.name=node0
                                              -Djboss.socket.binding.port-offset=100 
-                                             -Djava.net.preferIPv4Stack=true 
+                                             -Djava.net.preferIPv4Stack=true
                                              -Dsasl.credentials.properties=${basedir}/target/test-classes/jgroups-simple-auth.properties
                                              -Dsasl.local.principal=test_user
                                              -Dsasl.realm=test_realm
+                                             -Djgroups.join_timeout=2000
             </property>
             <property name="managementPort">10090</property>
          </configuration>
@@ -108,10 +111,11 @@
             <property name="serverConfig">standalone-ha.xml</property>
             <property name="javaVmArguments">-Djboss.node.name=node1 
                                              -Djboss.socket.binding.port-offset=200 
-                                             -Djava.net.preferIPv4Stack=true 
+                                             -Djava.net.preferIPv4Stack=true
                                              -Dsasl.credentials.properties=${basedir}/target/test-classes/jgroups-simple-auth.properties
                                              -Dsasl.local.principal=joining_test_user
                                              -Dsasl.realm=test_realm
+                                             -Djgroups.join_timeout=2000
             </property>
             <property name="managementPort">10190</property>
          </configuration>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node0.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node0.xml
@@ -66,7 +66,7 @@
          server_callback_handler_class="org.infinispan.test.integration.security.utils.SaslPropCallbackHandler" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
    <UFC max_credits="2m" min_threshold="0.40"/>
    <MFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node1-fail.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node1-fail.xml
@@ -65,7 +65,7 @@
          login_module_name="krb-node1-fail" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
 
    <UFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node1.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-krb-node1.xml
@@ -65,7 +65,7 @@
          login_module_name="krb-node1" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
 
    <UFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-node0.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-node0.xml
@@ -68,7 +68,7 @@
          sasl_props="com.sun.security.sasl.digest.realm=test_realm" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
    <UFC max_credits="2m" min_threshold="0.40"/>
    <MFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-node1.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-node1.xml
@@ -64,7 +64,7 @@
          client_callback_handler_class="org.infinispan.test.integration.security.utils.SaslPropCallbackHandler" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
 
    <UFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-user-node0.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-md5-user-node0.xml
@@ -68,7 +68,7 @@
          sasl_props="com.sun.security.sasl.digest.realm=test_realm" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
    <UFC max_credits="2m" min_threshold="0.40"/>
    <MFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-prop-handler-node0.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-prop-handler-node0.xml
@@ -66,7 +66,7 @@
          sasl_props="com.sun.security.sasl.digest.realm=test_realm" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
    <UFC max_credits="2m" min_threshold="0.40"/>
    <MFC max_credits="2m" min_threshold="0.40"/>

diff --git a/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-prop-handler-node1.xml b/integrationtests/security-it/src/test/resources/jgroups-tcp-sasl-prop-handler-node1.xml
@@ -64,7 +64,7 @@
          client_callback_handler_class="org.jgroups.auth.sasl.SimpleAuthorizingCallbackHandler" />
 
    <pbcast.STABLE stability_delay="500" desired_avg_gossip="5000" max_bytes="1m"/>
-   <pbcast.GMS print_local_addr="false" join_timeout="3000" view_bundling="false"/>
+   <pbcast.GMS print_local_addr="false" join_timeout="${jgroups.join_timeout:2000}" view_bundling="false"/>
 
 
    <UFC max_credits="2m" min_threshold="0.40"/>