February 2008 - jbosscache-commits

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-02-20 11:57:50 -0500 (Wed, 20 Feb 2008) New Revision: 5362 Modified: core/trunk/pom.xml Log: commons-logging is not an optional dependency Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-02-20 16:53:09 UTC (rev 5361) +++ core/trunk/pom.xml 2008-02-20 16:57:50 UTC (rev 5362) @@ -48,6 +48,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency>  <dependency> @@ -63,12 +68,6 @@ <optional>true</optional> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>sleepycat</groupId> <artifactId>je</artifactId> <version>1.7.0</version>

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5361 - core/tags/2.1.0.CR4.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-02-20 11:53:09 -0500 (Wed, 20 Feb 2008) New Revision: 5361 Modified: core/tags/2.1.0.CR4/pom.xml Log: commons-logging is not a optional dependency, updated that Modified: core/tags/2.1.0.CR4/pom.xml =================================================================== --- core/tags/2.1.0.CR4/pom.xml 2008-02-20 10:01:36 UTC (rev 5360) +++ core/tags/2.1.0.CR4/pom.xml 2008-02-20 16:53:09 UTC (rev 5361) @@ -48,6 +48,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency>  <dependency> @@ -63,12 +68,6 @@ <optional>true</optional> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>sleepycat</groupId> <artifactId>je</artifactId> <version>1.7.0</version>

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5360 - core/trunk/src/main/java/org/jboss/cache/interceptors.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-02-20 05:01:36 -0500 (Wed, 20 Feb 2008) New Revision: 5360 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java Log: removed unused code Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 09:52:11 UTC (rev 5359) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 10:01:36 UTC (rev 5360) @@ -82,18 +82,6 @@ { return super.invoke(ctx); } -// catch (LockingException le) -// { -// if (trace) log.trace("Locking exception occured, cleaning up locks.", le); -// releaseLocks(ctx); -// throw le; -// } -// catch (TimeoutException te) -// { -// if (trace) log.trace("Locking exception occured, cleaning up locks.", te); -// releaseLocks(ctx); -// throw te; -// } finally { // This is functionality from the UnlockInterceptor: @@ -133,36 +121,7 @@ } } - /** - * If an issue appears while acquiring a lock (e.g. timeout exception, upgrade exception) then acquire - * release all acquired locks before throwing it. - */ - private void releaseLocks(InvocationContext ctx) - { - // This should not be necessary - the finally block above will take care of non-tx calls that need cleaning up, even - // if there is an exception. - // For tx calls, the TxManager will call a rollback to free up resources. -- MS -// GlobalTransaction gtx = ctx.getGlobalTransaction(); -// if (trace) log.trace("Releasing existing locks. Global tx?" + gtx); -// if (gtx != null) -// { -// TransactionEntry te = cache.getTransactionTable().get(gtx); -// te.releaseAllLocksFIFO(gtx); -// } -// else -// { -// Thread currentThread = Thread.currentThread(); -// List<NodeLock> locks = ctx.getInvocationLocksAcquired(); -// if (locks != null) -// for (NodeLock aLock : locks) -// { -// aLock.release(currentThread); -// } -// } - } - - protected Object handlePutDataMethod(InvocationContext ctx, GlobalTransaction tx, Fqn fqn, Map data, boolean createUndoOps) throws Throwable { return handlePutMethod(ctx, fqn);

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5359 - in core/trunk/src: test/java/org/jboss/cache/api and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-02-20 04:52:11 -0500 (Wed, 20 Feb 2008) New Revision: 5359 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java Log: fixed following: if we remove a node twice in the same transaction, then second time a LockAcquisitionTimeout occured in PLI Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 09:09:29 UTC (rev 5358) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-20 09:52:11 UTC (rev 5359) @@ -192,7 +192,7 @@ Fqn childFqn = new Fqn(childName); NodeSPI child_node = n.getChildDirect(childFqn); if (child_node == null) child_node = n.addChildDirect(childFqn); - manageReverseRemove(ctx.getGlobalTransaction(), child_node, true); + manageReverseRemove(ctx.getGlobalTransaction(), child_node, true, null); n = child_node; } } @@ -314,7 +314,7 @@ List<NodeSPI> createdNodes = new LinkedList<NodeSPI>(); // we need to mark new nodes created as deleted since they are only created to form a path to the node being removed, to // create a lock. - boolean created = acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, false, true, false, createdNodes, true); + boolean created = acquireLocksWithTimeout(ctx, fqn, NodeLock.LockType.WRITE, true, false, true, true, createdNodes, true); if (ctx.getGlobalTransaction() != null) { TransactionEntry entry = tx_table.get(ctx.getGlobalTransaction()); @@ -512,7 +512,7 @@ // actually acquire the lock we need. This method blocks. acquireNodeLock(ctx, currentNode, owner, gtx, lockTypeRequired, timeout); - manageReverseRemove(gtx, currentNode, reverseRemoveCheck); + manageReverseRemove(gtx, currentNode, reverseRemoveCheck, createdNodes); // make sure the lock we acquired isn't on a deleted node/is an orphan!! // look into invalidated nodes as well NodeSPI repeek = peekNode(ctx, currentNodeFqn, true, true, true); @@ -566,7 +566,6 @@ childName = fqn.get(currentIndex); currentNode = currentNode.getChildDirect(childName); - log.trace("Current node's identity is :" + System.identityHashCode(currentNode)); } } while (true); return created; @@ -651,12 +650,16 @@ * Test if this node needs to be 'undeleted' * reverse the "remove" if the node has been previously removed in the same tx, if this operation is a put() */ - private void manageReverseRemove(GlobalTransaction gtx, NodeSPI childNode, boolean reverseRemoveCheck) + private void manageReverseRemove(GlobalTransaction gtx, NodeSPI childNode, boolean reverseRemoveCheck, List createdNodes) { boolean needToReverseRemove = reverseRemoveCheck && childNode.isDeleted() && tx_table.isNodeRemovedInTx(gtx, childNode.getFqn()); if (gtx != null && needToReverseRemove) { childNode.markAsDeleted(false); + if (createdNodes != null) + { + createdNodes.add(childNode); + } } } Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-02-20 09:09:29 UTC (rev 5358) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeAPITest.java 2008-02-20 09:52:11 UTC (rev 5359) @@ -356,4 +356,29 @@ assertEquals(childrenNames, rootNode.getChildrenNames()); } + public void testDoubleRemovalOfData() + { + try + { + cache.put("/foo/1/2/3", "item", 1); + tm.begin(); + assertEquals(cache.get("/foo/1/2/3", "item"), 1); + cache.removeNode("/foo/1"); + assertNull(cache.get("/foo/1", "item")); + cache.removeNode("/foo/1/2/3"); + assertNull(cache.get("/foo/1/2/3", "item")); + assertNull(cache.get("/foo/1", "item")); + tm.commit(); + assertFalse(cache.exists("/foo/1")); + assertNull(cache.get("/foo/1/2/3", "item")); + assertNull(cache.get("/foo/1", "item")); + } + catch (Throwable t) + { + t.printStackTrace(); + fail(t.toString()); + } + + } + }

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5358 - pojo/trunk.

by jbosscache-commits＠lists.jboss.org

Author: galder.zamarreno(a)jboss.com Date: 2008-02-20 04:09:29 -0500 (Wed, 20 Feb 2008) New Revision: 5358 Modified: pojo/trunk/ Log: Added SVN ignores to avoid Eclipse project files or Maven target directory being added to SVN by mistake. Property changes on: pojo/trunk ___________________________________________________________________ Name: svn:ignore + target .classpath .project .settings eclipse-output

16 years, 6 months

1
0
0 / 0

Hudson build became unstable: jboss-cache-core-jdk1.6 » JBoss Cache - Core Edition #194

by jboss-qa-internal＠redhat.com

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.6/org.jboss.cac...

16 years, 6 months

1
0
0 / 0

Hudson build became unstable: jboss-cache-core-jdk1.5 » JBoss Cache - Core Edition #271

by jboss-qa-internal＠redhat.com

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.5/org.jboss.cac...

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5357 - in core/trunk/src: test/java/org/jboss/cache/lock/pessimistic and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-02-19 15:28:55 -0500 (Tue, 19 Feb 2008) New Revision: 5357 Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java Log: http://jira.jboss.com/jira/browse/JBCACHE-1165 - this test was fixed in past, but failed again. Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-19 19:57:56 UTC (rev 5356) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-02-19 20:28:55 UTC (rev 5357) @@ -440,7 +440,7 @@ created = lock(ctx, fqn, lockType, createIfNotExists, timeout, acquireLockOnParent, reverseRemoveCheck, createdNodes, skipNotification); firstTry = false; } - while (createIfNotExists && peekNode(ctx, fqn, false, true, false) == null);// keep trying until we have the lock (fixes concurrent remove()) + while (createIfNotExists && (peekNode(ctx, fqn, false, false, false) == null));// keep trying until we have the lock (fixes concurrent remove()) return created; } @@ -566,6 +566,7 @@ childName = fqn.get(currentIndex); currentNode = currentNode.getChildDirect(childName); + log.trace("Current node's identity is :" + System.identityHashCode(currentNode)); } } while (true); return created; Modified: core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java 2008-02-19 19:57:56 UTC (rev 5356) +++ core/trunk/src/test/java/org/jboss/cache/lock/pessimistic/ConcurrentPutRemoveTest.java 2008-02-19 20:28:55 UTC (rev 5357) @@ -24,12 +24,13 @@ // The problem is in the way READ_COMMITTED is implemented, i.e., writers are not blocked by readers and this // allows a reader to hold a lock when a writer comes in and deletes the node in question. -@Test(groups = {"functional"}, enabled = false) +@Test(groups = {"functional"}, enabled = true) // Known issue - See JBCACHE-1164 and JBCACHE-1165 public class ConcurrentPutRemoveTest { private TransactionManager tm; + static int count = 0; private Cache cache; private final Log log = LogFactory.getLog(ConcurrentPutRemoveTest.class); @@ -60,9 +61,10 @@ } } - @Test(invocationCount = 25, enabled = false) + @Test(invocationCount = 500, enabled = true) public void testLock() throws Exception { + System.out.println("ConcurrentPutRemoveTest.testLock count = " + (++count)); for (int x = 0; x < 2; x++) { SeparateThread t = new SeparateThread(x);

16 years, 6 months

1
0
0 / 0

JBoss Cache SVN: r5356 - core/trunk.

by jbosscache-commits＠lists.jboss.org

Author: galder.zamarreno(a)jboss.com Date: 2008-02-19 14:57:56 -0500 (Tue, 19 Feb 2008) New Revision: 5356 Modified: core/trunk/pom.xml Log: [JBCACHE-1290] Added JBossAS profile that includes current dependencies used by AS trunk Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-02-18 13:48:05 UTC (rev 5355) +++ core/trunk/pom.xml 2008-02-19 19:57:56 UTC (rev 5356) @@ -291,4 +291,44 @@ </repository> </repositories> + <profiles> + <profile> + <id>JBossAS</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <jbosscache-core-version>2.1.0.CR3-JBossAS</jbosscache-core-version> + </properties> + <dependencies> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.1</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>5.0.0.Beta3Update1</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.3.GA</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.0.jboss</version> + </dependency> + <dependency> + <groupId>org.jboss.transaction</groupId> + <artifactId>jboss-jta</artifactId> + <version>4.3.0.BETA2</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + </project>

16 years, 6 months

1
0
0 / 0

Hudson build is back to stable: jboss-cache-core-jdk1.6 » JBoss Cache - Core Edition #193

by jboss-qa-internal＠redhat.com

See https://hudson.jboss.org/hudson/job/jboss-cache-core-jdk1.6/org.jboss.cac...

16 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits February 2008