You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/03/04 10:50:31 UTC
svn commit: r749953 -
/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java
Author: jukka
Date: Wed Mar 4 09:50:31 2009
New Revision: 749953
URL: http://svn.apache.org/viewvc?rev=749953&view=rev
Log:
JCR-2000: Deadlock on concurrent commits
Disabled the concurrency tests that mixed transactional and non-transactional writes.
Modified:
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java?rev=749953&r1=749952&r2=749953&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/daily/RandomOperationTest.java Wed Mar 4 09:50:31 2009
@@ -101,7 +101,16 @@
runTasks(new Task[]{task1, task2}, NUM_THREADS, end + MAX_WAIT_SECONDS * 1000);
}
- public void testContentAndVersionOperationsXAMixed() throws RepositoryException {
+ /**
+ * Test disabled since it violates the "Don't mix concurrent transactional
+ * and non-transactional writes to a single workspace" guideline formed
+ * during the concurrency review.
+ *
+ * @see <a href="http://jackrabbit.apache.org/concurrency-control.html">Concurrency control</a>
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-2000">JCR-2000</a>
+ */
+ public void disabledTestContentAndVersionOperationsXAMixed()
+ throws RepositoryException {
ContentOperationsTask task1 = new ContentOperationsTask(NUM_LEVELS, NODES_PER_LEVEL, SAVE_INTERVAL, end);
ContentOperationsTask task2 = new ContentOperationsTask(NUM_LEVELS, NODES_PER_LEVEL, SAVE_INTERVAL, end);
task2.setUseXA(true);
@@ -111,7 +120,16 @@
runTasks(new Task[]{task1, task2, task3, task4}, NUM_THREADS, end + MAX_WAIT_SECONDS * 1000);
}
- public void testContentAndVersionOperationsXAMixedShortSaveInterval() throws RepositoryException {
+ /**
+ * Test disabled since it violates the "Don't mix concurrent transactional
+ * and non-transactional writes to a single workspace" guideline formed
+ * during the concurrency review.
+ *
+ * @see <a href="http://jackrabbit.apache.org/concurrency-control.html">Concurrency control</a>
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-2000">JCR-2000</a>
+ */
+ public void disabledTestContentAndVersionOperationsXAMixedShortSaveInterval()
+ throws RepositoryException {
ContentOperationsTask task1 = new ContentOperationsTask(NUM_LEVELS, NODES_PER_LEVEL, 1, end);
ContentOperationsTask task2 = new ContentOperationsTask(NUM_LEVELS, NODES_PER_LEVEL, 1, end);
task2.setUseXA(true);
@@ -120,4 +138,5 @@
task4.setUseXA(true);
runTasks(new Task[]{task1, task2, task3, task4}, NUM_THREADS, end + MAX_WAIT_SECONDS * 1000);
}
+
}