ISPN-1901 Make MPING use different multicast addresses to UDP

infinispan · Mar 19, 2012 · fe437fc · fe437fc
1 parent 44a1d7e
commit fe437fc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/core/src/main/resources/jgroups-tcp.xml b/core/src/main/resources/jgroups-tcp.xml
@@ -68,7 +68,9 @@
    -->
 
    <MPING bind_addr="${jgroups.bind_addr:127.0.0.1}" break_on_coord_rsp="true"
-      mcast_addr="${jgroups.udp.mcast_addr:228.6.7.8}" mcast_port="${jgroups.udp.mcast_port:46655}" ip_ttl="${jgroups.udp.ip_ttl:2}"
+      mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
+      mcast_port="${jgroups.mping.mcast_port:43366}"
+      ip_ttl="${jgroups.udp.ip_ttl:2}"
       num_initial_members="3"/>
 
    <MERGE2 max_interval="30000" min_interval="10000"/>

diff --git a/core/src/test/resources/stacks/tcp.xml b/core/src/test/resources/stacks/tcp.xml
@@ -62,8 +62,9 @@
 	<!--/>-->
 
    <!--<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"/>-->
+   <!--mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"-->
+   <!--mcast_port="${jgroups.mping.mcast_port:43366}"-->
+   <!--ip_ttl="2" num_initial_members="3"/>-->
 
    <MERGE2 max_interval="10000"
            min_interval="3000"/>

diff --git a/core/src/test/resources/stacks/tcp_mping/tcp1.xml b/core/src/test/resources/stacks/tcp_mping/tcp1.xml
@@ -57,7 +57,9 @@
    <!--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"
+          mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
+          mcast_port="${jgroups.mping.mcast_port:43366}"
+          ip_ttl="${jgroups.udp.ip_ttl:2}"
           num_initial_members="3"/>
 
    <MERGE2 max_interval="30000"

diff --git a/core/src/test/resources/stacks/tcp_mping/tcp2.xml b/core/src/test/resources/stacks/tcp_mping/tcp2.xml
@@ -57,7 +57,9 @@
    <!--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"
+          mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
+          mcast_port="${jgroups.mping.mcast_port:43366}"
+          ip_ttl="${jgroups.udp.ip_ttl:2}"
           num_initial_members="3"/>
 
    <MERGE2 max_interval="30000"

diff --git a/demos/gui/src/main/resources/config-samples/jgroups-tcp.xml b/demos/gui/src/main/resources/config-samples/jgroups-tcp.xml
@@ -47,8 +47,11 @@
          oob_thread_pool.queue_max_size="100"
          oob_thread_pool.rejection_policy="discard"/>
 
-    <MPING timeout="2000"
-          num_initial_members="3" />
+   <MPING bind_addr="${jgroups.bind_addr:127.0.0.1}" break_on_coord_rsp="true"
+          mcast_addr="${jgroups.mping.mcast_addr:228.2.4.6}"
+          mcast_port="${jgroups.mping.mcast_port:43366}"
+          ip_ttl="${jgroups.udp.ip_ttl:2}"
+          num_initial_members="3" timeout="2000"/>
 
     <MERGE2 max_interval="30000"
             min_interval="10000"/>