JBoss Cache SVN: r8327 - core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read.
by jbosscache-commits＠lists.jboss.org
Author: galder.zamarreno(a)jboss.com
Date: 2010-01-20 08:46:30 -0500 (Wed, 20 Jan 2010)
New Revision: 8327
Modified:
core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java
Log:
[JBCACHE-1555] (Mvcc node peek could contain stale data) Made test a bit more robust.
Modified: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java 2010-01-20 11:46:20 UTC (rev 8326)
+++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java 2010-01-20 13:46:30 UTC (rev 8327)
@@ -44,6 +44,7 @@
import org.jboss.cache.config.Configuration.CacheMode;
import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.lock.IsolationLevel;
+import org.jboss.cache.util.TestingUtil;
import org.testng.annotations.Test;
/**
@@ -63,14 +64,13 @@
UnitTestCacheFactory factory = new UnitTestCacheFactory();
Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL);
cfg.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
- CacheSPI cache = (CacheSPI) factory.createCache(cfg, false, getClass());
+ CacheSPI cache = (CacheSPI) factory.createCache(cfg, true, getClass());
return cache;
}
public void testConcurrentUpdatesNoWriteSkew(Method m) throws Exception {
final int nbWriters = 10;
log.debug(m.getName());
- cache.start();
init();
CyclicBarrier barrier = new CyclicBarrier(nbWriters + 1);
List<Future<Void>> futures = new ArrayList<Future<Void>>(nbWriters);
@@ -114,7 +114,7 @@
log.debug("All threads finished, let's shutdown the executor and check whether any exceptions were reported");
for (Future<Void> future : futures) future.get();
} finally {
- if (cache != null) cache.stop();
+ if (cache != null) TestingUtil.killCaches(cache);
}
}
@@ -136,13 +136,10 @@
TransactionManager tx = getTm();
tx.begin();
try {
- // cache.put("/foo/mynode", "_lockthisplease_", "_lockthisplease_");
- // TODO: when testing writeSkew=true, uncomment line before and start commenting here to make it easier to debug...
cache.getInvocationContext().getOptionOverrides().setForceWriteLock(true);
int tmp = (Integer) cache.get("/foo/mynode", "scalar");
tmp++;
cache.put("/foo/mynode", "scalar", tmp);
- // TODO: ...and finish commenting here
} catch (Exception e) {
log.error("Unexpected", e);
tx.setRollbackOnly();
@@ -158,12 +155,6 @@
tx.begin();
try {
cache.put("/foo/mynode", "_lockthisplease_", "_lockthisplease_");
-// // TODO: when testing writeSkew=true, uncomment line before and start commenting here to make it easier to debug...
-// cache.getInvocationContext().getOptionOverrides().setForceWriteLock(true);
-// int tmp = (Integer) cache.get("/foo/mynode", "scalar");
-// tmp++;
-// cache.put("/foo/mynode", "scalar", tmp);
-// // TODO: ...and finish commenting here
} catch (Exception e) {
log.error("Unexpected", e);
tx.setRollbackOnly();
14 years, 11 months
- 1
- 0
Build failed in Hudson: jboss-cache-core-trunk-jdk1.6 #782
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/782/c...>
Changes:
[galder.zamarreno(a)jboss.com] [JBCACHE-1555] (Mvcc node peek could contain stale data) Re-peek after acquiring the lock to retrieve latest data container contents.
[galder.zamarreno(a)jboss.com] [JBCACHE-1561] (SingletonStoreCacheLoader does not work with MVCC) Singleton store now works with MVCC.
------------------------------------------
[...truncated 1249 lines...]
AU src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
AU src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java
AU src/main/java/org/jboss/cache/buddyreplication/Fqn2BuddyFqnVisitor.java
AU src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java
AU src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java
AU src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java
AU src/main/java/org/jboss/cache/buddyreplication/AddressLocator.java
AU src/main/java/org/jboss/cache/buddyreplication/BuddyLocator.java
AU src/main/java/org/jboss/cache/buddyreplication/BuddyNotInitException.java
AU src/main/java/org/jboss/cache/buddyreplication/JGroups26AddressLocator.java
AU src/main/java/org/jboss/cache/buddyreplication/JGroups28AddressLocator.java
AU src/main/java/org/jboss/cache/TreeCacheViewMBean.java
AU src/main/java/org/jboss/cache/InternalNode.java
A src/main/java/org/jboss/cache/marshall
AU src/main/java/org/jboss/cache/marshall/CacheMarshaller200.java
AU src/main/java/org/jboss/cache/marshall/NodeDataExceptionMarker.java
AU src/main/java/org/jboss/cache/marshall/MarshallUtil.java
AU src/main/java/org/jboss/cache/marshall/CacheMarshaller300.java
AU src/main/java/org/jboss/cache/marshall/CacheMarshaller210.java
AU src/main/java/org/jboss/cache/marshall/InactiveRegionAwareRpcDispatcher.java
AU src/main/java/org/jboss/cache/marshall/MarshalledValueMap.java
AU src/main/java/org/jboss/cache/marshall/MarshalledValueHelper.java
AU src/main/java/org/jboss/cache/marshall/MarshalledValue.java
AU src/main/java/org/jboss/cache/marshall/RegionalizedMethodCall.java
AU src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java
AU src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
AU src/main/java/org/jboss/cache/marshall/MethodCall.java
AU src/main/java/org/jboss/cache/marshall/AbstractMarshaller.java
AU src/main/java/org/jboss/cache/marshall/NodeData.java
AU src/main/java/org/jboss/cache/marshall/ExtendedResponse.java
AU src/main/java/org/jboss/cache/marshall/RegionNotFoundException.java
AU src/main/java/org/jboss/cache/marshall/RequestIgnoredResponse.java
AU src/main/java/org/jboss/cache/marshall/MarshallingException.java
AU src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java
AU src/main/java/org/jboss/cache/marshall/NodeDataMarker.java
A src/main/java/org/jboss/cache/marshall/ReplicationObserver.java
AU src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java
AU src/main/java/org/jboss/cache/marshall/InactiveRegionException.java
AU src/main/java/org/jboss/cache/marshall/RegionNameConflictException.java
AU src/main/java/org/jboss/cache/marshall/Marshaller.java
AU src/main/java/org/jboss/cache/Region.java
AU src/main/java/org/jboss/cache/Fqn.java
AU src/main/java/org/jboss/cache/LegacyRegionManagerImpl.java
A src/main/java/org/jboss/cache/loader
AU src/main/java/org/jboss/cache/loader/ManagedConnectionFactory.java
A src/main/java/org/jboss/cache/loader/s3
AU src/main/java/org/jboss/cache/loader/s3/S3CacheLoader.java
AU src/main/java/org/jboss/cache/loader/s3/S3LoaderConfig.java
AU src/main/java/org/jboss/cache/loader/s3/S3Exception.java
AU src/main/java/org/jboss/cache/loader/ClusteredCacheLoader.java
AU src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java
AU src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
AU src/main/java/org/jboss/cache/loader/AbstractCacheLoader.java
AU src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/FileCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java
AU src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
AU src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java
AU src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java
AU src/main/java/org/jboss/cache/loader/SingletonStoreCacheLoader.java
AU src/main/java/org/jboss/cache/loader/CacheLoaderAop.java
AU src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java
AU src/main/java/org/jboss/cache/loader/ClusteredCacheLoaderConfig.java
A src/main/java/org/jboss/cache/loader/jdbm
A src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader2Config.java
AU src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java
A src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader2.java
AU src/main/java/org/jboss/cache/loader/jdbm/Null.java
AU src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOldConfig.java
AU src/main/java/org/jboss/cache/loader/AbstractDelegatingCacheLoader.java
AU src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java
A src/main/java/org/jboss/cache/loader/tcp
AU src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
AU src/main/java/org/jboss/cache/loader/tcp/TcpCacheServerMBean.java
AU src/main/java/org/jboss/cache/loader/tcp/TcpCacheOperations.java
AU src/main/java/org/jboss/cache/loader/SingletonStoreDefaultConfig.java
AU src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java
AU src/main/java/org/jboss/cache/loader/C3p0ConnectionFactory.java
AU src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/AsyncCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/NonManagedConnectionFactory.java
A src/main/java/org/jboss/cache/loader/bdbje
AU src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java
AU src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoaderConfig.java
AU src/main/java/org/jboss/cache/loader/ConnectionFactory.java
AU src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoader.java
AU src/main/java/org/jboss/cache/loader/CacheLoader.java
AU src/main/java/org/jboss/cache/loader/FileCacheLoader.java
A src/main/java/org/jboss/cache/io
AU src/main/java/org/jboss/cache/io/ExposedByteArrayOutputStream.java
AU src/main/java/org/jboss/cache/io/ByteBuffer.java
AU src/main/java/org/jboss/cache/ReplicationException.java
AU src/main/java/org/jboss/cache/PessimisticNodeFactory.java
AU src/main/java/org/jboss/cache/CacheFactory.java
A src/main/tutorial
AU src/main/tutorial/README-Tutorial.txt
AU src/main/tutorial/build.xml
A src/main/resources
A src/main/resources/schema
A src/main/resources/schema/jbosscache-config-3.0.xsd
AU src/main/resources/schema/jbosscache-config-3.1.xsd
AU src/main/resources/schema/jbosscache-config-3.2.xsd
A src/main/resources/schema/jbosscache-registry-3.0.xsd
AU src/main/resources/schema/jbosscache-registry-3.1.xsd
AU src/main/resources/schema/jbosscache-registry-3.2.xsd
A src/main/resources/config2to3.bat
AU src/main/resources/config2to3.sh
A src/main/resources/config2to3.xslt
A src/main/resources/config-samples
AU src/main/resources/config-samples/non-blocking-state-transfer.xml
AU src/main/resources/config-samples/cacheloader-enabled.xml
AU src/main/resources/config-samples/multiplexer-enabled.xml
AU src/main/resources/config-samples/string-property-replaced.xml
AU src/main/resources/config-samples/external-jgroups-file.xml
AU src/main/resources/config-samples/all.xml
AU src/main/resources/config-samples/eviction-enabled.xml
AU src/main/resources/config-samples/local.xml
AU src/main/resources/config-samples/total-replication.xml
AU src/main/resources/config-samples/invalidation-async.xml
AU src/main/resources/config-samples/buddy-replication.xml
AU src/main/resources/cache-jdbc.properties
AU README-i18n.txt
AU release.sh
AU pom.xml
U .
At revision 8326
Parsing POMs
<===[HUDSON REMOTING CAPACITY]===> channel started
Executing Maven: -B -f <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/ws/./...> -cpu -U clean site -P test-hudson
[INFO] Scanning for projects...
WAGON_VERSION: 1.0-beta-2
[INFO] ------------------------------------------------------------------------
[INFO] Building JBoss Cache - Core Edition
[INFO] task-segment: [clean, site]
[INFO] ------------------------------------------------------------------------
[INFO] artifact org.apache.maven.plugins:maven-eclipse-plugin: checking for updates from repository.jboss.org
[INFO] artifact org.apache.maven.plugins:maven-eclipse-plugin: checking for updates from Main Maven Repo
[INFO] artifact org.apache.maven.plugins:maven-eclipse-plugin: checking for updates from snapshots.repository.codehaus.org
[INFO] artifact org.apache.maven.plugins:maven-eclipse-plugin: checking for updates from central
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from repository.jboss.org
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from Main Maven Repo
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from snapshots.repository.codehaus.org
[INFO] artifact org.apache.maven.plugins:maven-idea-plugin: checking for updates from central
[INFO] [clean:clean]
[INFO] artifact org.apache.maven.plugins:maven-jxr-plugin: checking for updates from repository.jboss.org
[INFO] artifact org.apache.maven.plugins:maven-jxr-plugin: checking for updates from Main Maven Repo
[INFO] artifact org.apache.maven.plugins:maven-jxr-plugin: checking for updates from snapshots.repository.codehaus.org
[INFO] artifact org.apache.maven.plugins:maven-jxr-plugin: checking for updates from central
[INFO] Setting property: classpath.resource.loader.class => 'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
[INFO] Setting property: velocimacro.messages.on => 'false'.
[INFO] Setting property: resource.loader => 'classpath'.
[INFO] Setting property: resource.manager.logwhenfound => 'false'.
[INFO] **************************************************************
[INFO] Starting Jakarta Velocity v1.4
[INFO] RuntimeInstance initializing.
[INFO] Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
[INFO] Default ResourceManager initializing. (class org.apache.velocity.runtime.resource.ResourceManagerImpl)
[INFO] Resource Loader Instantiated: org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader
[INFO] ClasspathResourceLoader : initialization starting.
[INFO] ClasspathResourceLoader : initialization complete.
[INFO] ResourceCache : initialized. (class org.apache.velocity.runtime.resource.ResourceCacheImpl)
[INFO] Default ResourceManager initialization complete.
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Include
[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
[INFO] Created: 20 parsers.
[INFO] Velocimacro : initialization starting.
[INFO] Velocimacro : adding VMs from VM library template : VM_global_library.vm
[ERROR] ResourceManager : unable to find resource 'VM_global_library.vm' in any resource loader.
[INFO] Velocimacro : error using VM library template VM_global_library.vm : org.apache.velocity.exception.ResourceNotFoundException: Unable to find resource 'VM_global_library.vm'
[INFO] Velocimacro : VM library template macro registration complete.
[INFO] Velocimacro : allowInline = true : VMs can be defined inline in templates
[INFO] Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
[INFO] Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
[INFO] Velocimacro : initialization complete.
[INFO] Velocity successfully started.
[INFO] artifact org.apache.maven.plugins:maven-pmd-plugin: checking for updates from repository.jboss.org
[INFO] artifact org.apache.maven.plugins:maven-pmd-plugin: checking for updates from Main Maven Repo
[INFO] artifact org.apache.maven.plugins:maven-pmd-plugin: checking for updates from snapshots.repository.codehaus.org
[INFO] artifact org.apache.maven.plugins:maven-pmd-plugin: checking for updates from central
Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-pmd-plugin/2...
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-pmd-plu...
43K downloaded
Downloading: http://repository.jboss.org/maven2/pmd/pmd-jdk14/4.2.2/pmd-jdk14-4.2.2.pom
Downloading: http://repo1.maven.org/maven2//pmd/pmd-jdk14/4.2.2/pmd-jdk14-4.2.2.pom
Downloading: http://repository.jboss.org/maven2/ant/ant/1.6/ant-1.6.pom
Downloading: http://repo1.maven.org/maven2//ant/ant/1.6/ant-1.6.pom
Downloading: http://repository.jboss.org/maven2/net/sourceforge/retroweaver/retroweave...
Downloading: http://repo1.maven.org/maven2//net/sourceforge/retroweaver/retroweaver-rt...
Downloading: http://repository.jboss.org/maven2/backport-util-concurrent/backport-util...
Downloading: http://repo1.maven.org/maven2//backport-util-concurrent/backport-util-con...
Downloading: http://repository.jboss.org/maven2/pmd/pmd-jdk14/4.2.2/pmd-jdk14-4.2.2.jar
Downloading: http://repo1.maven.org/maven2//pmd/pmd-jdk14/4.2.2/pmd-jdk14-4.2.2.jar
Downloading: http://repository.jboss.org/maven2/ant/ant/1.6/ant-1.6.jar
Downloading: http://repo1.maven.org/maven2//ant/ant/1.6/ant-1.6.jar
Downloading: http://repository.jboss.org/maven2/net/sourceforge/retroweaver/retroweave...
Downloading: http://repo1.maven.org/maven2//net/sourceforge/retroweaver/retroweaver-rt...
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-surefir...
4K downloaded
Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-surefir...
31K downloaded
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from snapshots.jboss.org
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from Main Maven Repo
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from snapshots.repository.codehaus.org
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from snapshots.jboss.org
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from download.java.net
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from e-xml.sourceforge.net
[INFO] snapshot org.codehaus.mojo:findbugs-maven-plugin:1.2-SNAPSHOT: checking for updates from berkeleydb-je.repository
Downloading: http://snapshots.repository.codehaus.org/org/codehaus/mojo/findbugs-maven...
5K downloaded
[HUDSON] Archiving <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/ws/./...> to /home/hudson/hudson_workspace/jobs/jboss-cache-core-trunk-jdk1.6/modules/org.jboss.cache$jbosscache-core/builds/2010-01-20_07-15-57/archive/org.jboss.cache/jbosscache-core/3.2.1-SNAPSHOT/pom.xml
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] Error building POM (may not be this project's POM).
Project ID: org.codehaus.mojo:findbugs-maven-plugin
Reason: POM 'org.codehaus.mojo:findbugs-maven-plugin' not found in repository: Downloaded file does not exist: /home/hudson/.m2/repository/org/codehaus/mojo/findbugs-maven-plugin/1.2-SNAPSHOT/findbugs-maven-plugin-1.2-20080322.132217-15.pom.tmp
org.codehaus.mojo:findbugs-maven-plugin:pom:1.2-20080322.132217-15
from the specified remote repositories:
download.java.net (http://download.java.net/maven/2/),
berkeleydb-je.repository (http://download.oracle.com/maven/),
snapshots.repository.codehaus.org (http://snapshots.repository.codehaus.org),
e-xml.sourceforge.net (http://e-xml.sourceforge.net/maven2/repository),
snapshots.jboss.org (http://snapshots.jboss.org/maven2),
Main Maven Repo (http://repo1.maven.org/maven2/),
central (http://repo1.maven.org/maven2),
repository.jboss.org (http://repository.jboss.org/maven2)
for project org.codehaus.mojo:findbugs-maven-plugin
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 39 seconds
[INFO] Finished at: Wed Jan 20 07:16:41 EST 2010
[INFO] Final Memory: 33M/138M
[INFO] ------------------------------------------------------------------------
Sending e-mails to: dpospisi(a)redhat.com jbosscache-commits(a)lists.jboss.org galder.zamarreno(a)jboss.com
channel stopped
14 years, 11 months
- 1
- 0
Hudson build completed: jboss-cache-core-trunk-jdk1.6 » JBoss Cache - Core Edition #782
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/jboss-cache-core-trunk-jdk1.6/org.j...>
14 years, 11 months
- 1
- 0
JBoss Cache SVN: r8326 - in core/trunk/src: test/java/org/jboss/cache/api/mvcc/repeatable_read and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: galder.zamarreno(a)jboss.com
Date: 2010-01-20 06:46:20 -0500 (Wed, 20 Jan 2010)
New Revision: 8326
Added:
core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java
Modified:
core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java
Log:
[JBCACHE-1555] (Mvcc node peek could contain stale data) Re-peek after acquiring the lock to retrieve latest data container contents.
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2010-01-20 10:11:53 UTC (rev 8325)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/MVCCNodeHelper.java 2010-01-20 11:46:20 UTC (rev 8326)
@@ -216,8 +216,10 @@
boolean needToCopy = false;
if (lockForWriting && acquireLock(context, fqn)) {
needToCopy = true;
+ // re-peek in case we waited for a lock and some other thread modified the data while we're waiting
+ nodes = dataContainer.peekInternalNodeAndDirectParent(fqn, includeInvalidNodes);
}
- n = nodeFactory.createWrappedNode(in, nodes[1]);
+ n = nodeFactory.createWrappedNode(nodes[0], nodes[1]);
context.putLookedUpNode(fqn, n);
if (needToCopy) n.markForUpdate(dataContainer, writeSkewCheck);
} else if (createIfAbsent) // else, do we need to create one?
Added: core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/api/mvcc/repeatable_read/ConcurrentRepeatableReadTest.java 2010-01-20 11:46:20 UTC (rev 8326)
@@ -0,0 +1,238 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.
+ */
+package org.jboss.cache.api.mvcc.repeatable_read;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import javax.transaction.Status;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.cache.AbstractSingleCacheTest;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.UnitTestCacheFactory;
+import org.jboss.cache.config.Configuration;
+import org.jboss.cache.config.Configuration.CacheMode;
+import org.jboss.cache.factories.UnitTestConfigurationFactory;
+import org.jboss.cache.lock.IsolationLevel;
+import org.testng.annotations.Test;
+
+/**
+ * ConcurrentRepeatableReadTest.
+ *
+ * @author Galder Zamarreño
+ */
+@Test(groups = { "functional" }, testName = "api.mvcc.repeatable_read.ConcurrentRepeatableReadTest")
+public class ConcurrentRepeatableReadTest extends AbstractSingleCacheTest
+{
+ static final Log log = LogFactory.getLog(ConcurrentRepeatableReadTest.class);
+ final ExecutorService executorService = Executors.newCachedThreadPool();
+
+ @Override
+ protected CacheSPI createCache() throws Exception
+ {
+ UnitTestCacheFactory factory = new UnitTestCacheFactory();
+ Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL);
+ cfg.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+ CacheSPI cache = (CacheSPI) factory.createCache(cfg, false, getClass());
+ return cache;
+ }
+
+ public void testConcurrentUpdatesNoWriteSkew(Method m) throws Exception {
+ final int nbWriters = 10;
+ log.debug(m.getName());
+ cache.start();
+ init();
+ CyclicBarrier barrier = new CyclicBarrier(nbWriters + 1);
+ List<Future<Void>> futures = new ArrayList<Future<Void>>(nbWriters);
+ for (int i = 0; i < nbWriters; i++) {
+ log.debug("Schedule execution");
+ Future<Void> future = executorService.submit(new IncrementNoWriteSkew(barrier));
+ futures.add(future);
+ }
+ barrier.await(); // wait for all threads to be ready
+ barrier.await(); // wait for all threads to finish
+
+ log.debug("All threads finished, let's shutdown the executor and check whether any exceptions were reported");
+ for (Future<Void> future : futures) future.get();
+
+ assertEquals(nbWriters, get());
+ }
+
+ public void testConcurrentUpdatesWriteSkew(Method m) throws Exception {
+ final int nbWriters = 10;
+ CacheSPI cache = null;
+ try {
+ log.debug(m.getName());
+ UnitTestCacheFactory factory = new UnitTestCacheFactory();
+ Configuration cfg = UnitTestConfigurationFactory.createConfiguration(CacheMode.LOCAL);
+ cfg.setIsolationLevel(IsolationLevel.REPEATABLE_READ);
+ cfg.setWriteSkewCheck(true);
+ cache = (CacheSPI) factory.createCache(cfg, false, getClass());
+ cache.start();
+ assert cache.getConfiguration().isWriteSkewCheck();
+ init();
+ CyclicBarrier barrier = new CyclicBarrier(nbWriters + 1);
+ List<Future<Void>> futures = new ArrayList<Future<Void>>(nbWriters);
+ for (int i = 0; i < nbWriters; i++) {
+ log.debug("Schedule execution");
+ Future<Void> future = executorService.submit(new IncrementWriteSkew(barrier));
+ futures.add(future);
+ }
+ barrier.await(); // wait for all threads to be ready
+ barrier.await(); // wait for all threads to finish
+
+ log.debug("All threads finished, let's shutdown the executor and check whether any exceptions were reported");
+ for (Future<Void> future : futures) future.get();
+ } finally {
+ if (cache != null) cache.stop();
+ }
+ }
+
+ private void init() throws Exception {
+ TransactionManager tx = getTm();
+ tx.begin();
+ try {
+ cache.put("/foo/mynode", "scalar", 0);
+ } catch (Exception e) {
+ tx.setRollbackOnly();
+ throw e;
+ } finally {
+ if (tx.getStatus() == Status.STATUS_ACTIVE) tx.commit();
+ else tx.rollback();
+ }
+ }
+
+ private void incrementNoWriteSkew() throws Exception {
+ TransactionManager tx = getTm();
+ tx.begin();
+ try {
+ // cache.put("/foo/mynode", "_lockthisplease_", "_lockthisplease_");
+ // TODO: when testing writeSkew=true, uncomment line before and start commenting here to make it easier to debug...
+ cache.getInvocationContext().getOptionOverrides().setForceWriteLock(true);
+ int tmp = (Integer) cache.get("/foo/mynode", "scalar");
+ tmp++;
+ cache.put("/foo/mynode", "scalar", tmp);
+ // TODO: ...and finish commenting here
+ } catch (Exception e) {
+ log.error("Unexpected", e);
+ tx.setRollbackOnly();
+ throw e;
+ } finally {
+ if (tx.getStatus() == Status.STATUS_ACTIVE) tx.commit();
+ else tx.rollback();
+ }
+ }
+
+ private void incrementWriteSkew() throws Exception {
+ TransactionManager tx = getTm();
+ tx.begin();
+ try {
+ cache.put("/foo/mynode", "_lockthisplease_", "_lockthisplease_");
+// // TODO: when testing writeSkew=true, uncomment line before and start commenting here to make it easier to debug...
+// cache.getInvocationContext().getOptionOverrides().setForceWriteLock(true);
+// int tmp = (Integer) cache.get("/foo/mynode", "scalar");
+// tmp++;
+// cache.put("/foo/mynode", "scalar", tmp);
+// // TODO: ...and finish commenting here
+ } catch (Exception e) {
+ log.error("Unexpected", e);
+ tx.setRollbackOnly();
+ throw e;
+ } finally {
+ if (tx.getStatus() == Status.STATUS_ACTIVE) tx.commit();
+ else tx.rollback();
+ }
+ }
+
+
+ public int get() throws Exception {
+ TransactionManager tx = getTm();
+ tx.begin();
+ try {
+ int ret = (Integer) cache.get("/foo/mynode", "scalar");
+ return ret;
+ } catch (Exception e) {
+ tx.setRollbackOnly();
+ throw e;
+ } finally {
+ if (tx.getStatus() == Status.STATUS_ACTIVE) tx.commit();
+ else tx.rollback();
+ }
+ }
+
+ private TransactionManager getTm() {
+ return cache.getConfiguration().getRuntimeConfig().getTransactionManager();
+ }
+
+ class IncrementNoWriteSkew implements Callable<Void> {
+ private final CyclicBarrier barrier;
+
+ public IncrementNoWriteSkew(CyclicBarrier barrier) {
+ this.barrier = barrier;
+ }
+
+ public Void call() throws Exception {
+ try {
+ log.debug("Wait for all executions paths to be ready to perform calls");
+ barrier.await();
+ incrementNoWriteSkew();
+ return null;
+ } finally {
+ log.debug("Wait for all execution paths to finish");
+ barrier.await();
+ }
+ }
+ }
+
+ class IncrementWriteSkew implements Callable<Void> {
+ private final CyclicBarrier barrier;
+
+ public IncrementWriteSkew(CyclicBarrier barrier) {
+ this.barrier = barrier;
+ }
+
+ public Void call() throws Exception {
+ try {
+ log.debug("Wait for all executions paths to be ready to perform calls");
+ barrier.await();
+ incrementWriteSkew();
+ return null;
+ } finally {
+ log.debug("Wait for all execution paths to finish");
+ barrier.await();
+ }
+ }
+ }
+
+
+}
14 years, 11 months
- 1
- 0
JBoss Cache SVN: r8325 - in core/trunk/src: test/java/org/jboss/cache/loader and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: galder.zamarreno(a)jboss.com
Date: 2010-01-20 05:11:53 -0500 (Wed, 20 Jan 2010)
New Revision: 8325
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/SingletonStoreCacheLoader.java
core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java
Log:
[JBCACHE-1561] (SingletonStoreCacheLoader does not work with MVCC) Singleton store now works with MVCC.
Modified: core/trunk/src/main/java/org/jboss/cache/loader/SingletonStoreCacheLoader.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/loader/SingletonStoreCacheLoader.java 2010-01-19 11:41:29 UTC (rev 8324)
+++ core/trunk/src/main/java/org/jboss/cache/loader/SingletonStoreCacheLoader.java 2010-01-20 10:11:53 UTC (rev 8325)
@@ -41,7 +41,6 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Vector;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -242,23 +241,22 @@
*/
protected void pushState(NodeSPI node) throws Exception
{
- /* Put the node's data first */
- Set keys = node.getKeysDirect();
- Fqn fqn = node.getFqn();
-
- for (Object aKey : keys)
- {
- Object value = cache.get(fqn, aKey);
- put(fqn, aKey, value);
- }
-
/* Navigates to the children */
- Collection<NodeSPI> children = node.getChildrenDirect();
- for (NodeSPI aChildren : children)
+ Collection<NodeSPI> children = node.getChildren();
+ if (trace) log.trace("Children for " + node.getFqn() + " are " + children);
+ if (!children.isEmpty())
{
- //Map.Entry entry = (Map.Entry) aChildren;
- pushState(aChildren);
+ for (NodeSPI aChildren : children)
+ {
+ pushState(aChildren);
+ }
}
+
+ Map data = node.getData();
+ Fqn fqn = node.getFqn();
+ if (!data.isEmpty()) {
+ put(fqn, data);
+ }
}
/**
Modified: core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2010-01-19 11:41:29 UTC (rev 8324)
+++ core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java 2010-01-20 10:11:53 UTC (rev 8325)
@@ -10,9 +10,10 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.CacheSPI;
import org.jboss.cache.Fqn;
+import org.jboss.cache.NodeSPI;
import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig;
import org.jboss.cache.config.Configuration.CacheMode;
-import org.jboss.cache.config.Configuration.NodeLockingScheme;
import org.jboss.cache.factories.UnitTestConfigurationFactory;
import org.jboss.cache.util.internals.ViewChangeListener;
import static org.testng.AssertJUnit.*;
@@ -20,6 +21,8 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
@@ -50,10 +53,6 @@
cache1 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass());
cache2 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass());
cache3 = (CacheSPI<Object, Object>) new UnitTestCacheFactory<Object, Object>().createCache(UnitTestConfigurationFactory.createConfiguration(CacheMode.REPL_SYNC), false, getClass());
-
- cache1.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC);
- cache2.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC);
- cache3.getConfiguration().setNodeLockingScheme(NodeLockingScheme.PESSIMISTIC);
}
public void testPutCacheLoaderWithNoPush() throws Exception
@@ -77,27 +76,16 @@
assertTrue("/test2 should have been entered in cl1", cl1.exists(fqn("/test2")));
assertTrue("/test3 should have been entered in cl1", cl1.exists(fqn("/test3")));
- assertFalse("/test1 should not be in cl2", cl2.exists(fqn("/test1")));
- assertFalse("/test2 should not be in cl2", cl2.exists(fqn("/test2")));
- assertFalse("/test3 should not be in cl2", cl2.exists(fqn("/test3")));
+ stopCache1(true);
- assertFalse("/test1 should not be in cl3", cl3.exists(fqn("/test1")));
- assertFalse("/test2 should not be in cl3", cl3.exists(fqn("/test2")));
- assertFalse("/test3 should not be in cl3", cl3.exists(fqn("/test3")));
-
- stopCache1();
-
cache2.put(fqn("/test4"), "key", "value");
cache3.put(fqn("/test5"), "key", "value");
assertTrue("/test4 should have been entered in cl2", cl2.exists(fqn("/test4")));
assertTrue("/test5 should have been entered in cl2", cl2.exists(fqn("/test5")));
- assertFalse("/test4 should not be in cl3", cl3.exists(fqn("/test4")));
- assertFalse("/test5 should not be in cl3", cl3.exists(fqn("/test5")));
+ stopCache2(true);
- stopCache2();
-
cache3.put(fqn("/test6"), "key", "value");
assertTrue("/test5 should have been entered in cl3", cl3.exists(Fqn.fromString("/test6")));
}
@@ -105,7 +93,7 @@
public void testPutCacheLoaderWithPush() throws Exception
{
initSingletonWithPushCache(cache1);
- initSingletonWithPushCache(cache2);
+ initSingletonWithWaitingPushCache(cache2);
initSingletonWithPushCache(cache3);
createCaches();
@@ -133,32 +121,39 @@
assertTrue(cl1.get(fqn("/e")).containsKey("e-key"));
assertTrue(cl1.get(fqn("/e/f/g")).containsKey("g-key"));
- assertFalse(cl2.exists(fqn("/a")));
- assertFalse(cl2.exists(fqn("/a")));
- assertFalse(cl2.exists(fqn("/a/b")));
- assertFalse(cl2.exists(fqn("/a/b")));
- assertFalse(cl2.exists(fqn("/a/b/c")));
- assertFalse(cl2.exists(fqn("/a/b/d")));
- assertFalse(cl2.exists(fqn("/e")));
- assertFalse(cl2.exists(fqn("/e/f/g")));
+ assertTrue(cl2.exists(fqn("/a")));
+ assertTrue(cl2.exists(fqn("/a")));
+ assertTrue(cl2.exists(fqn("/a/b")));
+ assertTrue(cl2.exists(fqn("/a/b")));
+ assertTrue(cl2.exists(fqn("/a/b/c")));
+ assertTrue(cl2.exists(fqn("/a/b/d")));
+ assertTrue(cl2.exists(fqn("/e")));
+ assertTrue(cl2.exists(fqn("/e/f/g")));
- assertFalse(cl3.exists(fqn("/a")));
- assertFalse(cl3.exists(fqn("/a")));
- assertFalse(cl3.exists(fqn("/a/b")));
- assertFalse(cl3.exists(fqn("/a/b")));
- assertFalse(cl3.exists(fqn("/a/b/c")));
- assertFalse(cl3.exists(fqn("/a/b/d")));
- assertFalse(cl3.exists(fqn("/e")));
- assertFalse(cl3.exists(fqn("/e/f/g")));
-
+ WaitForPushSingletonStoreCacheLoader scl2 = (WaitForPushSingletonStoreCacheLoader) cache2.getCacheLoaderManager().getCacheLoader();
+ CountDownLatch startPushLatch = new CountDownLatch(1);
+ scl2.setStartPushLatch(startPushLatch);
+
ViewChangeListener viewChangeListener = new ViewChangeListener(cache2);
-
- stopCache1();
+ stopCache1(false);
+ cache2.getInvocationContext().getOptionOverrides().setCacheModeLocal(true);
+ cache2.getInvocationContext().getOptionOverrides().setSuppressPersistence(true);
+ cache2.put(fqn("/e/i"), "i-key", "i-value");
+ startPushLatch.countDown();
viewChangeListener.waitForViewChange(60, TimeUnit.SECONDS);
- SingletonStoreCacheLoader scl2 = (SingletonStoreCacheLoader) cache2.getCacheLoaderManager().getCacheLoader();
waitForPushStateCompletion(scl2.getPushStateFuture());
+ assertTrue(cl2.exists(fqn("/a")));
+ assertTrue(cl2.exists(fqn("/a")));
+ assertTrue(cl2.exists(fqn("/a/b")));
+ assertTrue(cl2.exists(fqn("/a/b")));
+ assertTrue(cl2.exists(fqn("/a/b/c")));
+ assertTrue(cl2.exists(fqn("/a/b/d")));
+ assertTrue(cl2.exists(fqn("/e")));
+ assertTrue(cl2.exists(fqn("/e/f/g")));
+ assertTrue(cl2.exists(fqn("/e/i")));
+
assertTrue(cl2.get(fqn("/a")).containsKey("a-key"));
assertTrue(cl2.get(fqn("/a")).containsKey("aa-key"));
assertTrue(cl2.get(fqn("/a/b")).containsKey("b-key"));
@@ -167,6 +162,7 @@
assertTrue(cl2.get(fqn("/a/b/d")).containsKey("d-key"));
assertTrue(cl2.get(fqn("/e")).containsKey("e-key"));
assertTrue(cl2.get(fqn("/e/f/g")).containsKey("g-key"));
+ assertTrue(cl2.get(fqn("/e/i")).containsKey("i-key"));
cache2.put(fqn("/e/f/h"), "h-key", "h-value");
cache3.put(fqn("/i"), "i-key", "i-value");
@@ -174,19 +170,19 @@
assertTrue(cl2.get(fqn("/e/f/h")).containsKey("h-key"));
assertTrue(cl2.get(fqn("/i")).containsKey("i-key"));
- assertFalse(cl3.exists(fqn("/a")));
- assertFalse(cl3.exists(fqn("/a")));
- assertFalse(cl3.exists(fqn("/a/b")));
- assertFalse(cl3.exists(fqn("/a/b")));
- assertFalse(cl3.exists(fqn("/a/b/c")));
- assertFalse(cl3.exists(fqn("/a/b/d")));
- assertFalse(cl3.exists(fqn("/e")));
- assertFalse(cl3.exists(fqn("/e/f/g")));
- assertFalse(cl3.exists(fqn("/e/f/h")));
- assertFalse(cl3.exists(fqn("/i")));
+ assertTrue(cl3.exists(fqn("/a")));
+ assertTrue(cl3.exists(fqn("/a")));
+ assertTrue(cl3.exists(fqn("/a/b")));
+ assertTrue(cl3.exists(fqn("/a/b")));
+ assertTrue(cl3.exists(fqn("/a/b/c")));
+ assertTrue(cl3.exists(fqn("/a/b/d")));
+ assertTrue(cl3.exists(fqn("/e")));
+ assertTrue(cl3.exists(fqn("/e/f/g")));
+ assertTrue(cl3.exists(fqn("/e/f/h")));
+ assertTrue(cl3.exists(fqn("/i")));
viewChangeListener = new ViewChangeListener(cache3);
- stopCache2();
+ stopCache2(false);
viewChangeListener.waitForViewChange(60, TimeUnit.SECONDS);
SingletonStoreCacheLoader scl3 = (SingletonStoreCacheLoader) cache3.getCacheLoaderManager().getCacheLoader();
@@ -207,7 +203,7 @@
assertTrue(cl3.get(fqn("/a")).containsKey("aaa-key"));
- stopCache3();
+ stopCache3(true);
}
public void testAvoidConcurrentStatePush() throws Exception
@@ -279,28 +275,45 @@
return new ActiveStatusModifier(mscl);
}
- protected CacheLoaderConfig getSingletonStoreCacheLoaderConfig(String cacheloaderClass) throws Exception
+ protected CacheLoaderConfig getSingletonStoreCacheLoaderConfig(String cacheloaderClass, boolean isPush) throws Exception
{
CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, null, cacheloaderClass, "", false, false, false, false, false);
CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig sc = new CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig();
sc.setSingletonStoreEnabled(true);
- sc.setProperties("pushStateWhenCoordinator = true\n pushStateWhenCoordinatorTimeout = 5000\n");
+ sc.setProperties("pushStateWhenCoordinator = " + isPush + "\n pushStateWhenCoordinatorTimeout = 50000\n");
clc.getFirstCacheLoaderConfig().setSingletonStoreConfig(sc);
return clc;
}
+ protected CacheLoaderConfig getSingletonStoreCacheLoaderConfig(String cacheloaderClass, String singletonStoreClass) throws Exception
+ {
+ CacheLoaderConfig clc = UnitTestConfigurationFactory.buildSingleCacheLoaderConfig(false, null, cacheloaderClass, "", false, false, false, false, false);
+ CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig sc = new CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig();
+ sc.setSingletonStoreEnabled(true);
+ sc.setSingletonStoreClass(singletonStoreClass);
+ sc.setProperties("pushStateWhenCoordinator = true\n pushStateWhenCoordinatorTimeout = 50000\n");
+ clc.getFirstCacheLoaderConfig().setSingletonStoreConfig(sc);
+ return clc;
+ }
+
private void initSingletonNonPushCache(CacheSPI cache) throws Exception
{
cache.getConfiguration().setCacheLoaderConfig(getSingletonStoreCacheLoaderConfig(
- DummyInMemoryCacheLoader.class.getName()));
+ SingletonDummyInMemoryCacheLoader.class.getName(), false));
}
private void initSingletonWithPushCache(CacheSPI cache) throws Exception
{
cache.getConfiguration().setCacheLoaderConfig(getSingletonStoreCacheLoaderConfig(
- DummyInMemoryCacheLoader.class.getName()));
+ SingletonDummyInMemoryCacheLoader.class.getName(), true));
}
+ private void initSingletonWithWaitingPushCache(CacheSPI cache) throws Exception
+ {
+ cache.getConfiguration().setCacheLoaderConfig(getSingletonStoreCacheLoaderConfig(
+ SingletonDummyInMemoryCacheLoader.class.getName(), WaitForPushSingletonStoreCacheLoader.class.getName()));
+ }
+
private CacheLoader getDelegatingCacheLoader(CacheSPI cache)
{
AbstractDelegatingCacheLoader acl = (AbstractDelegatingCacheLoader) cache.getCacheLoaderManager().getCacheLoader();
@@ -312,31 +325,31 @@
return Fqn.fromString(fqn);
}
- private void stopCache1()
+ private void stopCache1(boolean clearCacheLoader)
{
if (cache1 != null)
{
- TestingUtil.killCaches(cache1);
+ TestingUtil.killCaches(clearCacheLoader, cache1);
}
cache1 = null;
}
- private void stopCache2()
+ private void stopCache2(boolean clearCacheLoader)
{
if (cache2 != null)
{
- TestingUtil.killCaches(cache2);
+ TestingUtil.killCaches(clearCacheLoader, cache2);
}
cache2 = null;
}
- private void stopCache3()
+ private void stopCache3(boolean clearCacheLoader)
{
if (cache3 != null)
{
- TestingUtil.killCaches(cache3);
+ TestingUtil.killCaches(clearCacheLoader, cache3);
}
cache3 = null;
@@ -345,9 +358,9 @@
@AfterMethod(alwaysRun = true)
public void tearDown()
{
- stopCache1();
- stopCache2();
- stopCache3();
+ stopCache1(true);
+ stopCache2(true);
+ stopCache3(true);
}
class MockSingletonStoreCacheLoader extends SingletonStoreCacheLoader
@@ -425,4 +438,76 @@
return null;
}
}
+
+ static class SingletonDummyInMemoryCacheLoader extends AbstractCacheLoader
+ {
+ static final DummyInMemoryCacheLoader singleton = new DummyInMemoryCacheLoader();
+
+ public boolean exists(Fqn name) throws Exception
+ {
+ return singleton.exists(name);
+ }
+
+ public Map<Object, Object> get(Fqn name) throws Exception
+ {
+ return singleton.get(name);
+ }
+
+ public Set<?> getChildrenNames(Fqn fqn) throws Exception
+ {
+ return singleton.getChildrenNames(fqn);
+ }
+
+ public IndividualCacheLoaderConfig getConfig()
+ {
+ return singleton.getConfig();
+ }
+
+ public Object put(Fqn name, Object key, Object value) throws Exception
+ {
+ return singleton.put(name, key, value);
+ }
+
+ public void put(Fqn name, Map<Object, Object> attributes) throws Exception
+ {
+ singleton.put(name, attributes);
+ }
+
+ public Object remove(Fqn fqn, Object key) throws Exception
+ {
+ return singleton.remove(fqn, key);
+ }
+
+ public void remove(Fqn fqn) throws Exception
+ {
+ singleton.remove(fqn);
+ }
+
+ public void removeData(Fqn fqn) throws Exception
+ {
+ singleton.removeData(fqn);
+ }
+
+ public void setConfig(IndividualCacheLoaderConfig config)
+ {
+ singleton.setConfig(config);
+ }
+ }
+
+ static class WaitForPushSingletonStoreCacheLoader extends SingletonStoreCacheLoader {
+ CountDownLatch startPushLatch;
+
+ WaitForPushSingletonStoreCacheLoader() {
+ }
+
+ public void setStartPushLatch(CountDownLatch startPushLatch) {
+ this.startPushLatch = startPushLatch;
+ }
+
+ @Override
+ protected void pushState(NodeSPI node) throws Exception {
+ startPushLatch.await();
+ super.pushState(node);
+ }
+ }
}
Modified: core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2010-01-19 11:41:29 UTC (rev 8324)
+++ core/trunk/src/test/java/org/jboss/cache/util/TestingUtil.java 2010-01-20 10:11:53 UTC (rev 8325)
@@ -527,6 +527,94 @@
}
/**
+ * Kills a cache - stops it, clears any data in any cache loaders, and rolls back any associated txs
+ */
+ public static void killCaches(boolean clearCacheLoader, Cache... caches)
+ {
+ for (Cache c : caches)
+ {
+ try
+ {
+ if (c!= null) utf.removeCache(c);
+ if (c != null) // && ( (c.getCacheStatus() == CacheStatus.STARTED) || c.getCacheStatus() == CacheStatus.FAILED) )
+ {
+ CacheSPI spi = (CacheSPI) c;
+
+ Channel channel = null;
+ if (spi.getRPCManager() != null)
+ {
+ channel = spi.getRPCManager().getChannel();
+ }
+ if (spi.getTransactionManager() != null)
+ {
+ try
+ {
+ spi.getTransactionManager().rollback();
+ }
+ catch (Throwable t)
+ {
+ // don't care
+ }
+ }
+
+ if (clearCacheLoader)
+ {
+ CacheLoaderManager clm = spi.getCacheLoaderManager();
+ CacheLoader cl = clm == null ? null : clm.getCacheLoader();
+ if (cl != null)
+ {
+ try
+ {
+ cl.remove(Fqn.ROOT);
+ }
+ catch (Throwable t)
+ {
+ // don't care
+ }
+ }
+ }
+
+ try
+ {
+ spi.stop();
+ } catch (Throwable t) {
+ System.err.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to stop.");
+ t.printStackTrace();
+ }
+ try {
+ spi.destroy();
+ } catch (Throwable t) {
+ System.err.println(Thread.currentThread().getName() + " !!!!!!!!!!!!!!!!!!!!! WARNING - Cache instance refused to destroy.");
+ t.printStackTrace();
+ }
+ if (channel != null)
+ {
+ if (channel.isOpen()) {
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still opened.");
+ Thread.dumpStack();
+ channel.close();
+ }
+ if (channel.isOpen()) {
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel close failed.");
+ System.exit(-1);
+ }
+ if (channel.isConnected()) {
+ System.err.println(Thread.currentThread().getName() + "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Channel still connected.");
+ Thread.dumpStack();
+ System.exit(-1);
+ }
+ }
+ }
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ System.exit(-1);
+ }
+ }
+ }
+
+ /**
* Clears any associated transactions with the current thread in the caches' transaction managers.
*/
public static void killTransactions(Cache... caches)
14 years, 11 months
- 1
- 0
JBoss Cache SVN: r8324 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2010-01-19 06:41:29 -0500 (Tue, 19 Jan 2010)
New Revision: 8324
Modified:
benchmarks/benchmark-fwk/trunk/README.txt
Log:
Modified: benchmarks/benchmark-fwk/trunk/README.txt
===================================================================
--- benchmarks/benchmark-fwk/trunk/README.txt 2009-12-22 05:51:13 UTC (rev 8323)
+++ benchmarks/benchmark-fwk/trunk/README.txt 2010-01-19 11:41:29 UTC (rev 8324)
@@ -1,5 +1,9 @@
README.txt
+**** NOTE **** This project is deprecated. It has been migrated to SourceForge as a standalone project - see http://cachebenchfwk.sourceforge.net - and has been heavily modernized since migrating. Please refer to the new project on SourceForge for best results.
+
+Older content of this file:
+
All information on this framework, including usage, is maintained online:
http://wiki.jboss.org/wiki/Wiki.jsp?page=CacheBenchmarkFramework
14 years, 11 months
- 1
- 0