jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1434007 - /jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java
Date Wed, 16 Jan 2013 16:08:28 GMT
Author: mreutegg
Date: Wed Jan 16 16:08:28 2013
New Revision: 1434007

URL: http://svn.apache.org/viewvc?rev=1434007&view=rev
Log:
OAK-560: MongoMK.commit() not atomic
- more concurrent threads makes it more likely to occur

Modified:
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java

Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java?rev=1434007&r1=1434006&r2=1434007&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java
Wed Jan 16 16:08:28 2013
@@ -344,9 +344,9 @@ public class MongoMKBranchMergeTest exte
     }
 
     @Test
-    @Ignore("OAK-535")
+    @Ignore("OAK-560")
     public void concurrentNonConflictingMerges() throws Exception {
-        int numThreads = 5;
+        int numThreads = 10;
         mk.commit("/", "+\"test\":{}", null, null);
         List<Thread> workers = new ArrayList<Thread>();
         final List<Exception> exceptions = Collections.synchronizedList(new ArrayList<Exception>());
@@ -357,7 +357,7 @@ public class MongoMKBranchMergeTest exte
                 @Override
                 public void run() {
                     try {
-                        for (int i = 0; i < 100; i++) {
+                        for (int i = 0; i < 50; i++) {
                             String branchRev = mk.branch(null);
                             branchRev = mk.commit(path, "+\"node" + i + "\":{}", branchRev,
null);
                             mk.merge(branchRev, null);



Mime
View raw message