jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1487492 - in /jackrabbit/oak/trunk/oak-mongomk/src: main/java/org/apache/jackrabbit/mongomk/MongoMK.java test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java
Date Wed, 29 May 2013 14:01:14 GMT
Author: mreutegg
Date: Wed May 29 14:01:14 2013
New Revision: 1487492

URL: http://svn.apache.org/r1487492
Log:
OAK-619: Lock-free MongoMK implementation
- log info message when MongoMK is disposed
- make sure initial data is visible to test in ConcurrentConflictTest

Modified:
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java

Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java?rev=1487492&r1=1487491&r2=1487492&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
Wed May 29 14:01:14 2013
@@ -392,6 +392,7 @@ public class MongoMK implements MicroKer
                 clusterNodeInfo.dispose();
             }
             store.dispose();
+            LOG.info("Disposed MongoMK with clusterNodeId: {}", clusterId);
         }
     }
 

Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java?rev=1487492&r1=1487491&r2=1487492&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ConcurrentConflictTest.java
Wed May 29 14:01:14 2013
@@ -52,13 +52,15 @@ public class ConcurrentConflictTest exte
     private final StringBuilder logBuffer = new StringBuilder();
 
     @Before
-    public void setup() {
+    @Override
+    public void initMongoMK() {
         logBuffer.setLength(0);
         this.store = new MemoryDocumentStore();
         MongoMK mk = openMongoMK();
         for (int i = 0; i < NUM_NODES; i++) {
             mk.commit("/", "+\"node-" + i + "\":{\"value\":100}", null, null);
         }
+        mk.dispose();
         for (int i = 0; i < NUM_WRITERS; i++) {
             kernels.add(openMongoMK());
         }



Mime
View raw message