svn commit: r1570707 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java

[mreutegg]

Author: mreutegg
Date: Fri Feb 21 21:17:48 2014
New Revision: 1570707

URL: http://svn.apache.org/r1570707
Log:
OAK-1260: Using multiple cluster nodes can corrupt the data
- make sure initial content is visible to subsequently started cluster nodes

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java?rev=1570707&r1=1570706&r2=1570707&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/cluster/AbstractClusterTest.java
 Fri Feb 21 21:17:48 2014
@@ -27,6 +27,7 @@ import junit.framework.Assert;
 
 import org.apache.jackrabbit.oak.jcr.Jcr;
 import org.apache.jackrabbit.oak.jcr.NodeStoreFixture;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.After;
 import org.junit.Before;
@@ -74,6 +75,11 @@ public class AbstractClusterTest {
             return;
         }
         r1  = new Jcr(ns1).createRepository();
+        if (ns1 instanceof DocumentNodeStore) {
+            // make sure initial repository data is visible to
+            // other cluster nodes initialized later
+            ((DocumentNodeStore) ns1).runBackgroundOperations();
+        }
         s1 = r1.login(new SimpleCredentials("admin", "admin".toCharArray()));
         ns2 = fixture.createNodeStore(2);
         r2  = new Jcr(ns2).createRepository();