[jbosscache-commits] JBoss Cache SVN: r7149 - in core/trunk/src: main/java/org/jboss/cache/buddyreplication and 6 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Mon Nov 17 18:15:11 EST 2008
Author: mircea.markus
Date: 2008-11-17 18:15:11 -0500 (Mon, 17 Nov 2008)
New Revision: 7149
Modified:
core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/EvictionTestsBase.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java
core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java
Log:
various test parallelization fixes
Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -452,7 +452,7 @@
log.trace("callRemoteMethods(): valid members are " + recipients + " methods: " + command + " Using OOB? " + useOutOfBandMessage);
if (channel.flushSupported() && !flushBlockGate.await(configuration.getStateRetrievalTimeout(), TimeUnit.MILLISECONDS))
{
- throw new TimeoutException("State retrieval timed out waiting for flush unblock.");
+ throw new TimeoutException("State retrieval timed out waiting for flush unblock. (timeout = " + configuration.getStateRetrievalTimeout() + " millis) ");
}
useOutOfBandMessage = false;
RspList rsps = rpcDispatcher.invokeRemoteCommands(recipients, command, modeToUse, timeout, isUsingBuddyReplication, useOutOfBandMessage, responseFilter);
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -598,8 +598,7 @@
}
/**
- * Called by CacheImpl._remoteAssignToBuddyGroup(BuddyGroup g) when a method
- * call for this is received from a remote cache.
+ * Called by {@link AssignToBuddyGroupCommand} thic command is received from a remote cache.
*
* @param newGroup the buddy group
* @param state Map<Fqn, byte[]> of any state from the DataOwner. Cannot
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -53,7 +53,7 @@
// ensure that, if configured, nodes are kept alive for at least a minimum period of time.
if (isYoungerThanMinimumTimeToLive(entry))
{
- log.trace("Do not evict - is younger than minimum TTL");
+ if (trace) log.trace("Do not evict - is younger than minimum TTL");
return false;
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/DisabledStateTransferTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -30,7 +30,10 @@
c.put("/" + cacheNumber++, "k", "v");
}
- TestingUtil.blockUntilViewsReceived(caches.toArray(new CacheSPI[0]), 60000);
+ waitForBuddy(caches.get(0), caches.get(1), true);
+ waitForBuddy(caches.get(1), caches.get(2), true);
+ waitForBuddy(caches.get(2), caches.get(0), true);
+ Thread.sleep(2000);//wait for state transfer
for (CacheSPI c : caches)
System.out.println("Cache (local address " + c.getLocalAddress() + ") contents: " + CachePrinter.printCacheLockingInfo(c));
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizePolicyTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -6,10 +6,7 @@
*/
package org.jboss.cache.eviction;
-import org.jboss.cache.CacheSPI;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.Node;
-import org.jboss.cache.NodeSPI;
+import org.jboss.cache.*;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
@@ -17,7 +14,6 @@
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
import org.jboss.cache.util.TestingUtil;
-import org.jboss.cache.util.internals.EvictionWatcher;
import org.jboss.cache.util.internals.EvictionController;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
@@ -26,8 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.jboss.cache.UnitTestCacheFactory;
/**
* @author Daniel Huang
@@ -48,11 +42,6 @@
{
initCaches();
wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
- if (wakeupIntervalMillis < 0)
- {
- fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
- }
-
t1_ex = t2_ex = null;
isTrue = true;
}
@@ -60,7 +49,7 @@
void initCaches() throws Exception
{
Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
- EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new ElementSizeAlgorithmConfig(5000, 100), 200000), 200);
+ EvictionConfig evConfig = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new ElementSizeAlgorithmConfig(5000, 100), 200000), -1);
evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/data"), new ElementSizeAlgorithmConfig(10, 20)));
evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/org/jboss/test/data"), new ElementSizeAlgorithmConfig(-1, 5)));
evConfig.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/test/"), new ElementSizeAlgorithmConfig(5000, 1)));
@@ -144,7 +133,7 @@
for (int i = 0; i < 20; i++)
{
String str = rootStr + Integer.toString(i);
- Fqn fqn = Fqn.fromString(str);
+ Fqn fqn = Fqn.fromString(str);//"/org/jboss/data/i";
cache.put(fqn, i, str);
for (int k = 0; k < i; k++)
{
@@ -178,7 +167,7 @@
Node node = cache.getNode("/org/jboss/data/3");
assertEquals(21, node.getData().size());
- assert waitForEviction(cache, 30, TimeUnit.SECONDS, Fqn.fromString("/org/jboss/data/3")) : "Eviction event not received!";
+ evictionController.startEviction();
TestingUtil.sleepThread(200); // small grace period
assertNull(cache.getNode("/org/jboss/data/3"));
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/EvictionTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/EvictionTestsBase.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/EvictionTestsBase.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -23,7 +23,9 @@
{
Fqn fqn = Fqn.fromString(fqnString);
Configuration c = new Configuration();
- c.setEvictionConfig(new EvictionConfig());
+ EvictionConfig evictionConfig = new EvictionConfig();
+ evictionConfig.setWakeupInterval(-1);
+ c.setEvictionConfig(evictionConfig);
EvictionRegionConfig erc = new EvictionRegionConfig(fqn, config);
c.getEvictionConfig().addEvictionRegionConfig(erc);
CacheSPI mockCache = EasyMock.createNiceMock(CacheSPI.class);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -195,14 +195,14 @@
RegionImpl region = (RegionImpl) regionManager.getRegion("/a/b", true);
config.setMaxNodes(-1);
config.setTimeToLive(-1);
- config.setMaxAge(100);
+ config.setMaxAge(1000);
region.registerEvictionEvent(fqn1, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn2, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn3, EvictionEvent.Type.ADD_NODE_EVENT);
algorithm.process(region.getEvictionEventQueue());
assertEquals("Queue size #1: ", 3, algorithm.getEvictionQueue().getNumberOfNodes());
- TestingUtil.sleepThread(110);
+ TestingUtil.sleepThread(1100);
algorithm.process(region.getEvictionEventQueue());
assertEquals("Queue size #2: ", 0, algorithm.getEvictionQueue().getNumberOfNodes());
}
@@ -212,7 +212,7 @@
*
* @throws Exception
*/
- public void testMaxAgeSeconds2() throws EvictionException
+ public void testMaxAgeSeconds2() throws Throwable
{
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
@@ -221,17 +221,17 @@
config.setMaxNodes(-1);
config.setTimeToLive(-1);
- config.setMaxAge(100);
+ config.setMaxAge(1000);
region.registerEvictionEvent(fqn1, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn2, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn3, EvictionEvent.Type.ADD_NODE_EVENT);
algorithm.process(region.getEvictionEventQueue());
assertEquals("Queue size #1: ", 3, algorithm.getEvictionQueue().getNumberOfNodes());
- TestingUtil.sleepThread(50);
+ TestingUtil.sleepThread(500);
algorithm.process(region.getEvictionEventQueue());
assertEquals("Queue size #2: ", 3, algorithm.getEvictionQueue().getNumberOfNodes());
- TestingUtil.sleepThread(60);
+ TestingUtil.sleepThread(600);
algorithm.process(region.getEvictionEventQueue());
assertEquals("Queue size #3: ", 0, algorithm.getEvictionQueue().getNumberOfNodes());
}
@@ -249,8 +249,8 @@
// Should have a maximum of 2 nodes.
config.setMaxNodes(2);
- config.setTimeToLive(100);
- config.setMaxAge(300);
+ config.setTimeToLive(1000);
+ config.setMaxAge(3000);
region.registerEvictionEvent(fqn1, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn2, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn4, EvictionEvent.Type.ADD_NODE_EVENT);
@@ -262,7 +262,7 @@
assert 2 == numNodesInQueue : "Queue size #1: expected 2 but was " + numNodesInQueue;
// make sure all nodes now expire
- TestingUtil.sleepThread(110);
+ TestingUtil.sleepThread(1100);
region.registerEvictionEvent(fqn3, EvictionEvent.Type.ADD_NODE_EVENT);
@@ -271,7 +271,7 @@
numNodesInQueue = eq.getNumberOfNodes();
assert 1 == numNodesInQueue : "Queue size #2: expected 1 but was " + numNodesInQueue;
- TestingUtil.sleepThread(310);
+ TestingUtil.sleepThread(3100);
// visit the node now to prevent the idle time from doing the pruning - node still gets pruned but by
// max age.
region.registerEvictionEvent(fqn3, EvictionEvent.Type.VISIT_NODE_EVENT);
@@ -293,8 +293,8 @@
RegionImpl region = (RegionImpl) regionManager.getRegion("/a/b", true);
config.setMaxNodes(2);
- config.setTimeToLive(100);
- config.setMaxAge(300);
+ config.setTimeToLive(1000);
+ config.setMaxAge(3000);
region.registerEvictionEvent(fqn1, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn2, EvictionEvent.Type.ADD_NODE_EVENT);
region.registerEvictionEvent(fqn2, EvictionEvent.Type.REMOVE_NODE_EVENT);
@@ -306,7 +306,7 @@
assert 1 == numNodesInQueue : "Queue size #1: expected 1 but was " + numNodesInQueue;
// make sure existing events all time out
- TestingUtil.sleepThread(110);
+ TestingUtil.sleepThread(1100);
region.registerEvictionEvent(fqn3, EvictionEvent.Type.ADD_NODE_EVENT);
algorithm.process(region.getEvictionEventQueue());
@@ -314,7 +314,7 @@
numNodesInQueue = eq.getNumberOfNodes();
assert 1 == numNodesInQueue : "Queue size #2: expected 1 but was " + numNodesInQueue;
- TestingUtil.sleepThread(310);
+ TestingUtil.sleepThread(3100);
region.registerEvictionEvent(fqn3, EvictionEvent.Type.VISIT_NODE_EVENT);
algorithm.process(region.getEvictionEventQueue());
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUPolicyTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -34,11 +34,11 @@
public class LRUPolicyTest extends EvictionTestsBase
{
CacheSPI<Object, Object> cache;
- long wakeupIntervalMillis = 200;
- long dataRegionTTLMillis = 200;
- long testRegionTTLMillis = 200;
+ long wakeupIntervalMillis = 1000;
+ long dataRegionTTLMillis = 1000;
+ long testRegionTTLMillis = 1000;
private int baseRegionMaxNodes = 10;
- private int baseRegionTTLMillis = 200;
+ private int baseRegionTTLMillis = 1000;
final String ROOT_STR = "/test";
Throwable t1_ex, t2_ex;
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUPolicyTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -16,6 +16,7 @@
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.transaction.DummyTransactionManagerLookup;
import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.EvictionController;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -27,7 +28,7 @@
* @author Daniel Huang (dhuang at jboss.org)
* @version $Revision$
*/
- at Test(groups = {"functional"}, sequential = true, testName = "eviction.MRUPolicyTest")
+ at Test(groups = {"functional"}, testName = "eviction.MRUPolicyTest")
public class MRUPolicyTest
{
CacheSPI<Object, Object> cache;
@@ -82,7 +83,7 @@
cache.put("/org/jboss/test/data/d", "/org/jboss/test/data/d", "/org/jboss/test/data/d");
cache.put("/org/jboss/test/data/e", "/org/jboss/test/data/e", "/org/jboss/test/data/e");
- TestingUtil.sleepThread(wakeupIntervalMillis + 500);
+ TestingUtil.sleepThread(wakeupIntervalMillis + 800);
cache.put("/org/jboss/test/data/f", "/org/jboss/test/data/f", "/org/jboss/test/data/f");
cache.put("/org/jboss/test/data/g", "/org/jboss/test/data/g", "/org/jboss/test/data/g");
@@ -90,7 +91,7 @@
assertNotNull(cache.get("/org/jboss/test/data/a", "/org/jboss/test/data/a"));
assertNotNull(cache.get("/org/jboss/test/data/b", "/org/jboss/test/data/b"));
- TestingUtil.sleepThread(wakeupIntervalMillis + 500);
+ TestingUtil.sleepThread(wakeupIntervalMillis + 800);
assertNull(cache.get("/org/jboss/test/data/a", "/org/jboss/test/data/a"));
assertNull(cache.get("/org/jboss/test/data/b", "/org/jboss/test/data/b"));
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/OptimisticEvictionTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -28,7 +28,7 @@
*
* @author fhenning
*/
- at Test(groups = {"functional"}, sequential = true, testName = "eviction.OptimisticEvictionTest")
+ at Test(groups = {"functional"}, testName = "eviction.OptimisticEvictionTest")
public class OptimisticEvictionTest extends EvictionTestsBase
{
private CacheSPI<Object, Object> cache;
@@ -46,7 +46,7 @@
{
EvictionConfig result = new EvictionConfig(new EvictionRegionConfig(Fqn.ROOT, new LRUAlgorithmConfig(0, 0, 10)), 200);
result.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/testingRegion"), new LRUAlgorithmConfig(0, 0, 10)));
- result.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/timeBased"), new LRUAlgorithmConfig(1, 1, 0)));
+ result.addEvictionRegionConfig(new EvictionRegionConfig(Fqn.fromString("/timeBased"), new LRUAlgorithmConfig(1000, 1000, 0)));
return result;
}
@@ -57,12 +57,11 @@
cache = null;
}
- @Test(invocationCount = 10)
public void testEvictionOccurence() throws Exception
{
cache.put("/timeBased/test", "key", "value");
assertTrue(cache.exists("/timeBased/test"));
- TestingUtil.sleepThread(100);
+ TestingUtil.sleepThread(2000);
new EvictionController(cache).startEviction();
assertTrue(!cache.exists("/timeBased/test"));
}
Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderStateTransferTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -63,6 +63,7 @@
clc.getFirstCacheLoaderConfig().setPurgeOnStartup(true);
c.setCacheLoaderConfig(clc);
c.setCacheMode(CacheMode.REPL_SYNC);
+ c.setStateRetrievalTimeout(1000 * 120);//allow 2 minutes for before state transfer timeouts
return c;
}
Modified: core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/options/cachemodelocal/AsyncInvalidationPessLocksTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -31,4 +31,9 @@
{
TestingUtil.sleepThread(500);
}
+
+ public void testPutKeyValueViaNodeAPI() throws Exception
+ {
+ super.testPutDataViaNodeAPI();
+ }
}
Modified: core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2008-11-17 18:08:06 UTC (rev 7148)
+++ core/trunk/src/test/java/org/jboss/cache/transaction/pessimistic/ConcurrentTransactionalTest.java 2008-11-17 23:15:11 UTC (rev 7149)
@@ -36,7 +36,7 @@
*
* @version $Id$
*/
- at Test(groups = {"functional", "transaction"}, sequential = true, testName = "transaction.pessimistic.ConcurrentTransactionalTest")
+ at Test(groups = {"functional", "transaction"}, testName = "transaction.pessimistic.ConcurrentTransactionalTest")
public class ConcurrentTransactionalTest
{
private CacheSPI<Integer, String> cache;
@@ -51,7 +51,7 @@
private void createCache(IsolationLevel level)
{
- Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, true);
+ Configuration conf = UnitTestCacheConfigurationFactory.createConfiguration(Configuration.CacheMode.LOCAL, false);
conf.setCacheMode(Configuration.CacheMode.LOCAL);
conf.setIsolationLevel(level);
conf.setTransactionManagerLookupClass(TransactionSetup.getManagerLookup());
@@ -118,7 +118,7 @@
System.out.println("keys: " + l);
for (int i = 0; i < NUM; i++)
{
- if (!l.contains(new Integer(i)))
+ if (!l.contains(i))
{
System.out.println("missing: " + i);
}
More information about the jbosscache-commits
mailing list