[jbosscache-commits] JBoss Cache SVN: r7337 - in core/trunk: src/main/resources/config-samples and 7 other directories.

jbosscache-commits at lists.jboss.org jbosscache-commits at lists.jboss.org
Thu Dec 18 21:32:29 EST 2008


Author: mircea.markus
Date: 2008-12-18 21:32:29 -0500 (Thu, 18 Dec 2008)
New Revision: 7337

Modified:
   core/trunk/pom.xml
   core/trunk/src/main/resources/config-samples/buddy-replication.xml
   core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
   core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
   core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java
   core/trunk/src/test/java/org/jboss/cache/testng/Base.java
   core/trunk/src/test/java/org/jboss/cache/testng/Other.java
   core/trunk/src/test/resources/configs/buddy-replication-cache.xml
   core/trunk/src/test/resources/configs/conf2x/buddy-replication-cache.xml
Log:
run tests on TCP

Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/pom.xml	2008-12-19 02:32:29 UTC (rev 7337)
@@ -141,6 +141,12 @@
                <parallel>tests</parallel>
                <threadCount>10</threadCount>
                <forkMode>none</forkMode>
+               <systemProperties>
+                  <property>
+                     <name>jgroups.stack</name>
+                     <value>${protocol.stack}</value>
+                  </property>
+               </systemProperties>
                <trimStackTrace>false</trimStackTrace>
                <properties>
                   <property>
@@ -398,6 +404,7 @@
          <id>test-hudson</id>
          <properties>
             <defaultTestGroup>functional,unit</defaultTestGroup>
+            <protocol.stack>udp</protocol.stack>
          </properties>
       </profile>
 
@@ -405,6 +412,7 @@
          <id>test-functional</id>
          <properties>
             <defaultTestGroup>functional</defaultTestGroup>
+            <protocol.stack>tcp</protocol.stack>
          </properties>
       </profile>
 
@@ -440,6 +448,7 @@
          <id>test-integration</id>
          <properties>
             <defaultTestGroup>integration</defaultTestGroup>
+            <protocol.stack>udp</protocol.stack>
          </properties>
       </profile>
 

Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml	2008-12-19 02:32:29 UTC (rev 7337)
@@ -14,7 +14,7 @@
 
       <!-- JGroups protocol stack properties. -->
       <jgroupsConfig>
-         <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true"
+         <TCP start_port="7800" discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true"
               enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
               oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="8"
               oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"

Modified: core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/UnitTestCacheFactory.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -55,6 +55,17 @@
       }
    };
 
+   private static final ThreadLocal<String> threadTcpStartPort = new ThreadLocal<String>()
+   {
+      private final AtomicInteger uniqueAddr = new AtomicInteger(7800);
+
+      @Override
+      protected String initialValue()
+      {
+         return uniqueAddr.getAndAdd(10) + "";
+      }
+   };
+
    /**
     * Holds unique mcast_port for each thread used for JGroups channel construction.
     */
@@ -166,7 +177,7 @@
             break;
          default:
             log.info("Unknown cache mode!");
-            System.exit(0);
+            throw new IllegalStateException("Unknown cache mode!");
       }
 
       Cache<K, V> cache = new DefaultCacheFactory<K, V>().createCache(configuration, start);
@@ -240,7 +251,9 @@
     */
    public void mangleConfiguration(Configuration configuration)
    {
-      configuration.setClusterConfig(mangleClusterConfiguration(configuration.getClusterConfig()));
+      String clusterConfig = configuration.getClusterConfig();
+      clusterConfig = mangleClusterConfiguration(clusterConfig);
+      configuration.setClusterConfig(clusterConfig);
       // Check if the cluster name contains thread id. If not, append.
       // We can not just append the threadId, since some of the tests are crating instances
       // using configurations derived from configurations returned by this factory.
@@ -256,10 +269,29 @@
 
    }
 
+   public String mangleClusterConfiguration(String clusterConfig)
+   {
+      if (clusterConfig == null)
+      {
+         if (UnitTestCacheConfigurationFactory.JGROUPS_CHANNEL.equals("udp"))
+            return mangleClusterConfigurationUdp(clusterConfig);
+         else
+            return mangleClusterConfigurationTcp(clusterConfig);
+      }
+      if (clusterConfig.contains("UDP("))
+      {
+         clusterConfig = mangleClusterConfigurationUdp(clusterConfig);
+      } else
+      {
+         clusterConfig = mangleClusterConfigurationTcp(clusterConfig);
+      }
+      return clusterConfig;
+   }
+
    /**
     * Updates cluster configuration to ensure mutual thread isolation.
     */
-   public String mangleClusterConfiguration(String clusterConfig)
+   public String mangleClusterConfigurationUdp(String clusterConfig)
    {
       if (clusterConfig == null)
       {
@@ -272,18 +304,17 @@
 
       }
 
-     // replace mcast_addr
+      // replace mcast_addr
       Pattern pattern = Pattern.compile("mcast_addr=[^;]*");
       Matcher m = pattern.matcher(clusterConfig);
       if (m.find())
       {
-         String origAddr = m.group().substring(m.group().indexOf("=") + 1);
          String newAddr = threadMcastIP.get();
          clusterConfig = m.replaceFirst("mcast_addr=" + newAddr);
       } else
       {
          Thread.dumpStack();
-         System.exit(1);
+         throw new IllegalStateException();
       }
 
       // replace mcast_port
@@ -299,6 +330,43 @@
       return clusterConfig;
    }
 
+   /**
+    * Updates cluster configuration to ensure mutual thread isolation.
+    */
+   public String mangleClusterConfigurationTcp(String clusterConfig)
+   {
+      if (clusterConfig == null)
+      {
+         clusterConfig = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC).getClusterConfig();
+      }
+
+      // replace mcast_addr
+      Pattern pattern = Pattern.compile("start_port=[^;]*");
+      Matcher m = pattern.matcher(clusterConfig);
+      String newStartPort = null;
+      if (m.find())
+      {
+         newStartPort = threadTcpStartPort.get();
+         clusterConfig = m.replaceFirst("start_port=" + newStartPort);
+      }
+      else
+      {
+         System.out.println("Config is;" + clusterConfig);
+         Thread.dumpStack();
+         throw new IllegalStateException();
+      }
+
+      // replace mcast_port
+      pattern = Pattern.compile("initial_hosts=[^;]*");
+      m = pattern.matcher(clusterConfig);
+      if (m.find())
+      {
+         clusterConfig = m.replaceFirst("initial_hosts=" + "127.0.0.1["+ newStartPort +"]");
+      }
+
+      return clusterConfig;
+   }
+
 //   private String getThreadId()
 //   {
 //      return "[" + Thread.currentThread().getName() + "]";
@@ -339,4 +407,4 @@
       }
       return null;
    }
-}
+}
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/Buddy3NodesNoPoolWithDataGravitationTest.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -88,59 +88,7 @@
    }
 
 
-   public void testCompleteStateSurvival() throws Exception
-   {
-      CacheBlockListener blockListener = new CacheBlockListener();
 
-      caches.get(0).addCacheListener(blockListener);
-      caches.get(1).addCacheListener(blockListener);
-      caches.get(2).addCacheListener(blockListener);
-
-      caches.get(0).put("/0", "key", "value");
-      caches.get(1).put("/1", "key", "value");
-      caches.get(2).put("/2", "key", "value");
-
-//      TestingUtil.sleepThread(getSleepTimeout());
-      //TestingUtil.sleepThread(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
-      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
-
-      caches.get(2).stop();
-
-      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
-
-      assertEquals("value", caches.get(0).get("/2", "key"));
-
-      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
-
-      caches.get(1).stop();
-
-      // cache[0] is all thats left!!
-
-      assertEquals("value", caches.get(0).get("/0", "key"));
-
-      try
-      {
-         assertEquals("value", caches.get(0).get("/1", "key"));
-      }
-      catch (RuntimeException e)
-      {
-         // may barf the first time around since we are unable to contact our buddy and store this data.
-         assertEquals(IllegalArgumentException.class, e.getCause().getClass());
-      }
-
-      // now try the assertion again since the local gravitation would have worked.
-
-      assertEquals("value", caches.get(0).get("/1", "key"));
-      assertEquals("value", caches.get(0).get("/2", "key"));
-      caches.get(1).start();
-      caches.get(2).start();
-      caches.get(0).removeCacheListener(blockListener);
-      caches.get(1).removeCacheListener(blockListener);
-      caches.get(2).removeCacheListener(blockListener);
-
-      waitForSingleBuddy(caches);
-   }
-
    public void testTransactionsCommit() throws Exception
    {
 
@@ -506,4 +454,57 @@
          }
       }
    }
+   
+   @Test (enabled = true, dependsOnMethods = {"testConcurrency","testStaleRegionOnBuddy","testStaleRegionOnDataOwner", "testDataGravitationDontKillOwner", "testTransactionsCommit", "testTransactionsRollback", "testSubtreeRetrieval"})
+   public void testCompleteStateSurvival() throws Exception
+   {
+      CacheBlockListener blockListener = new CacheBlockListener();
+
+      caches.get(0).addCacheListener(blockListener);
+      caches.get(1).addCacheListener(blockListener);
+      caches.get(2).addCacheListener(blockListener);
+
+      caches.get(0).put("/0", "key", "value");
+      caches.get(1).put("/1", "key", "value");
+      caches.get(2).put("/2", "key", "value");
+
+//      TestingUtil.sleepThread(getSleepTimeout());
+      //TestingUtil.sleepThread(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
+      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 3);
+
+      caches.get(2).stop();
+
+      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
+
+      assertEquals("value", caches.get(0).get("/2", "key"));
+
+      blockListener.blockUntilAllCachesAreUnblocked(caches.get(0).getConfiguration().getStateRetrievalTimeout() * 5);
+
+      caches.get(1).stop();
+
+      // cache[0] is all thats left!!
+
+      assertEquals("value", caches.get(0).get("/0", "key"));
+
+      try
+      {
+         assertEquals("value", caches.get(0).get("/1", "key"));
+      }
+      catch (RuntimeException e)
+      {
+         // may barf the first time around since we are unable to contact our buddy and store this data.
+         assertEquals(IllegalArgumentException.class, e.getCause().getClass());
+      }
+
+      // now try the assertion again since the local gravitation would have worked.
+
+      assertEquals("value", caches.get(0).get("/1", "key"));
+      assertEquals("value", caches.get(0).get("/2", "key"));
+      caches.get(0).stop();
+
+      caches = createCaches(3, false, true);
+
+      waitForSingleBuddy(caches);
+   }
+
 }

Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -37,6 +37,7 @@
    static
    {
       JGROUPS_CHANNEL = System.getProperty(JGROUPS_STACK_TYPE, "tcp");
+      System.out.println("IN USE JGROUPS_CHANNEL = " + JGROUPS_CHANNEL);
    }
 
    public static Configuration createConfiguration(CacheMode mode) throws ConfigurationException
@@ -232,13 +233,13 @@
             if (stackName.startsWith(JGROUPS_CHANNEL))
             {
                Element jgroupsStack = (Element) stack.getElementsByTagNameNS("*", "config").item(0);
-               if (mode == CacheMode.REPL_ASYNC && !stackName.contains("-"))
+               if (!mode.isSynchronous() && !stackName.contains("-"))
                {
                   conf.setClusterConfig(jgroupsStack);
                   conf.setCacheMode(CacheMode.REPL_ASYNC);
                   break;
                }
-               else if (mode == CacheMode.REPL_SYNC && stackName.contains("-"))
+               else if (mode.isSynchronous() && stackName.contains("-"))
                {
                   conf.setClusterConfig(jgroupsStack);
                   conf.setCacheMode(CacheMode.REPL_SYNC);

Modified: core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/ChannelInjectionPreferenceTest.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -63,7 +63,7 @@
    {
       muxHelper.configureCacheForMux(cache);
 
-      Channel channel = new JChannel(new UnitTestCacheFactory().mangleClusterConfiguration(
+      Channel channel = new JChannel(new UnitTestCacheFactory().mangleClusterConfigurationUdp(
               UnitTestCacheConfigurationFactory.getClusterConfigFromProperties(JChannel.DEFAULT_PROTOCOL_STACK)));
 
       RuntimeConfig rtcfg = cache.getConfiguration().getRuntimeConfig();

Modified: core/trunk/src/test/java/org/jboss/cache/testng/Base.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/Base.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/testng/Base.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -1,33 +1,72 @@
 package org.jboss.cache.testng;
 
 import org.testng.annotations.*;
+import org.jboss.cache.Cache;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.*;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 
 /**
  * @author Mircea.Markus at jboss.com
  */
- at Test(groups = "functional")
-public abstract class Base
+ at Test(groups = "functional", testName = "Base")
+public class Base
 {
+   Cache cache;
+
    @BeforeClass
    public void beforeTest()
    {
-      System.out.println("Base.beforeTest");
+//      System.out.println("Base.beforeTest");
+      Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true);
+      cache = new UnitTestCacheFactory().createCache(config, true, getClass());
+      System.out.println("Base:::" + cache.getConfiguration().getClusterConfig());
    }
 
    @AfterClass
    public void afterTest()
    {
-      System.out.println("Base.afterTest");
+//      System.out.println("Base.afterTest");
+      cache.stop();
    }
 
    @BeforeMethod
    public void beforeMethod()
    {
-      System.out.println("Base.beforeMethod");
+//      System.out.println("Base.beforeMethod");
    }
 
+   public void testNoTest() {}
    protected String getThreadName()
    {
       return "[" + getClass() + " ************ -> " + Thread.currentThread().getName() + "] ";
    }
 }
+
+//Base:::UDP(discard_incompatible_packets=true;enable_bundling=false;enable_diagnostics=true;ip_ttl=2;loopback=false;m
+//ax_bundle_size=64000;max_bundle_timeout=30;mcast_addr=228.10.10.11;mcast_port=45589;mcast_recv_buf_size=25000000;mca
+//st_send_buf_size=640000;oob_thread_pool.enabled=true;oob_thread_pool.keep_alive_time=10000;oob_thread_pool.max_threa
+//ds=4;oob_thread_pool.min_threads=1;oob_thread_pool.queue_enabled=false;oob_thread_pool.queue_max_size=10;oob_thread_
+//pool.rejection_policy=Run;thread_naming_pattern=pl;thread_pool.enabled=true;thread_pool.keep_alive_time=30000;thread
+//_pool.max_threads=25;thread_pool.min_threads=1;thread_pool.queue_enabled=false;thread_pool.queue_max_size=100;thread
+//_pool.rejection_policy=Run;tos=8;ucast_recv_buf_size=20000000;ucast_send_buf_size=640000;use_concurrent_stack=true;u
+//se_incoming_packet_handler=true):PING(num_initial_members=3;timeout=2000):MERGE2(max_interval=30000;min_interval=100
+//00):FD_SOCK:FD(max_tries=2;shun=true;timeout=1000):VERIFY_SUSPECT(timeout=250):pbcast.NAKACK(discard_delivered_msgs=
+//true;gc_lag=0;retransmit_timeout=300,600,900,1200;use_mcast_xmit=false):UNICAST(timeout=300,600,900,1200):pbcast.STA
+//BLE(desired_avg_gossip=50000;max_bytes=400000;stability_delay=1000):pbcast.GMS(join_timeout=1000;print_local_addr=fa
+//lse;shun=false;view_ack_collection_timeout=1000;view_bundling=true):FRAG2(frag_size=60000):pbcast.STREAMING_STATE_TR
+//ANSFER:pbcast.FLUSH(timeout=0)
+//Other:::UDP(discard_incompatible_packets=true;enable_bundling=false;enable_diagnostics=true;ip_ttl=2;loopback=false;
+//max_bundle_size=64000;max_bundle_timeout=30;mcast_addr=228.10.10.12;mcast_port=45590;mcast_recv_buf_size=25000000;mc
+//ast_send_buf_size=640000;oob_thread_pool.enabled=true;oob_thread_pool.keep_alive_time=10000;oob_thread_pool.max_thre
+//ads=4;oob_thread_pool.min_threads=1;oob_thread_pool.queue_enabled=false;oob_thread_pool.queue_max_size=10;oob_thread
+//_pool.rejection_policy=Run;thread_naming_pattern=pl;thread_pool.enabled=true;thread_pool.keep_alive_time=30000;threa
+//d_pool.max_threads=25;thread_pool.min_threads=1;thread_pool.queue_enabled=false;thread_pool.queue_max_size=100;threa
+//d_pool.rejection_policy=Run;tos=8;ucast_recv_buf_size=20000000;ucast_send_buf_size=640000;use_concurrent_stack=true;
+//use_incoming_packet_handler=true):PING(num_initial_members=3;timeout=2000):MERGE2(max_interval=30000;min_interval=10
+//000):FD_SOCK:FD(max_tries=2;shun=true;timeout=1000):VERIFY_SUSPECT(timeout=250):pbcast.NAKACK(discard_delivered_msgs
+//=true;gc_lag=0;retransmit_timeout=300,600,900,1200;use_mcast_xmit=false):UNICAST(timeout=300,600,900,1200):pbcast.ST
+//ABLE(desired_avg_gossip=50000;max_bytes=400000;stability_delay=1000):pbcast.GMS(join_timeout=1000;print_local_addr=f
+//alse;shun=false;view_ack_collection_timeout=1000;view_bundling=true):FRAG2(frag_size=60000):pbcast.STREAMING_STATE_T
+//RANSFER:pbcast.FLUSH(timeout=0)
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/testng/Other.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/testng/Other.java	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/java/org/jboss/cache/testng/Other.java	2008-12-19 02:32:29 UTC (rev 7337)
@@ -1,23 +1,51 @@
 package org.jboss.cache.testng;
 
 import org.testng.annotations.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterClass;
+import org.jboss.cache.Cache;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 
 /**
  * @author Mircea.Markus at jboss.com
  */
- at Test(groups = "functional", enabled = false, testName = "Same")
+ at Test(groups = "functional", testName = "Same")
 public class Other
 {
-   public void eeeeeeeeeeee() {
-      System.out.println(getThreadName() + "   eeeeeeeeeeee");
+   Cache cache;
+
+   @BeforeClass
+   public void beforeTest()
+   {
+//      System.out.println("Base.beforeTest");
+      Configuration config = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.REPL_SYNC, true);
+      cache = new UnitTestCacheFactory().createCache(config, true, getClass());
+      System.out.println("Other:::" + cache.getConfiguration().getClusterConfig());
    }
-   public void ffffffffffff() {
-      System.out.println(getThreadName() + "   ffffffffffff");
-   }
 
-   protected String getThreadName()
+   @AfterClass
+   public void afterTest()
    {
-      return "[" + getClass() + " ************ -> " + Thread.currentThread().getName() + "] ";
+//      System.out.println("Base.afterTest");
+      cache.stop();
    }
 
+   public void testNoTest(){}
 }
+
+
+//One:::UDP(discard_incompatible_packets=true;enable_bundling=false;enable_diagnostics=true;ip_ttl=2;loopback=false;ma
+//x_bundle_size=64000;max_bundle_timeout=30;mcast_addr=228.10.10.11;mcast_port=45589;mcast_recv_buf_size=25000000;mcas
+//t_send_buf_size=640000;oob_thread_pool.enabled=true;oob_thread_pool.keep_alive_time=10000;oob_thread_pool.max_thread
+//s=4;oob_thread_pool.min_threads=1;oob_thread_pool.queue_enabled=false;oob_thread_pool.queue_max_size=10;oob_thread_p
+//ool.rejection_policy=Run;thread_naming_pattern=pl;thread_pool.enabled=true;thread_pool.keep_alive_time=30000;thread_
+//pool.max_threads=25;thread_pool.min_threads=1;thread_pool.queue_enabled=false;thread_pool.queue_max_size=100;thread_
+//pool.rejection_policy=Run;tos=8;ucast_recv_buf_size=20000000;ucast_send_buf_size=640000;use_concurrent_stack=true;us
+//e_incoming_packet_handler=true):PING(num_initial_members=3;timeout=2000):MERGE2(max_interval=30000;min_interval=1000
+//0):FD_SOCK:FD(max_tries=2;shun=true;timeout=1000):VERIFY_SUSPECT(timeout=250):pbcast.NAKACK(discard_delivered_msgs=t
+//rue;gc_lag=0;retransmit_timeout=300,600,900,1200;use_mcast_xmit=false):UNICAST(timeout=300,600,900,1200):pbcast.STAB
+//LE(desired_avg_gossip=50000;max_bytes=400000;stability_delay=1000):pbcast.GMS(join_timeout=1000;print_local_addr=fal
+//se;shun=false;view_ack_collection_timeout=1000;view_bundling=true):FRAG2(frag_size=60000):pbcast.STREAMING_STATE_TRA
+//NSFER:pbcast.FLUSH(timeout=0)

Modified: core/trunk/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/buddy-replication-cache.xml	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml	2008-12-19 02:32:29 UTC (rev 7337)
@@ -18,7 +18,7 @@
       </buddy>
       <stateRetrieval timeout="20000"/>
       <jgroupsConfig>
-         <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
+         <TCP start_port="7800" recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
               max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
               enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
               thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"

Modified: core/trunk/src/test/resources/configs/conf2x/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/conf2x/buddy-replication-cache.xml	2008-12-18 21:56:44 UTC (rev 7336)
+++ core/trunk/src/test/resources/configs/conf2x/buddy-replication-cache.xml	2008-12-19 02:32:29 UTC (rev 7337)
@@ -65,7 +65,7 @@
       -->
       <attribute name="ClusterConfig">
          <config>
-            <TCP recv_buf_size="20000000" use_send_queues="false"
+            <TCP start_port="7800" recv_buf_size="20000000" use_send_queues="false"
                  loopback="false"
                  discard_incompatible_packets="true"
                  max_bundle_size="64000"




More information about the jbosscache-commits mailing list