svn commit: r1833498 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/mongo/ test/java/org/apache/jackrabbit/oak/plugins/document/

[mreutegg]

Author: mreutegg
Date: Thu Jun 14 08:08:38 2018
New Revision: 1833498

URL: http://svn.apache.org/viewvc?rev=1833498&view=rev
Log:
OAK-7543: MissingLastRevSeekerTest fails on MongoDB with secondary preferred

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java?rev=1833498&r1=1833497&r2=1833498&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
 Thu Jun 14 08:08:38 2018
@@ -79,7 +79,7 @@ public class MongoMissingLastRevSeeker e
     }
 
     private MongoCollection<BasicDBObject> getClusterNodeCollection() {
-        return store.getDBCollection(CLUSTER_NODES);
+        return store.getDBCollection(CLUSTER_NODES, ReadPreference.primary());
     }
 }
 

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1833498&r1=1833497&r2=1833498&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 Thu Jun 14 08:08:38 2018
@@ -38,6 +38,7 @@ public abstract class AbstractDocumentSt
     protected List<String> removeMe = new ArrayList<String>();
     protected List<String> removeMeSettings = new ArrayList<String>();
     protected List<String> removeMeJournal = new ArrayList<String>();
+    protected List<String> removeMeClusterNodes = new ArrayList<String>();
 
     static final Logger LOG = 
LoggerFactory.getLogger(AbstractDocumentStoreTest.class);
 
@@ -57,6 +58,7 @@ public abstract class AbstractDocumentSt
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.NODES, 
removeMe);
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.SETTINGS, 
removeMeSettings);
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL, 
removeMeJournal);
+        
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.CLUSTER_NODES,
 removeMeClusterNodes);
         ds.dispose();
         dsf.dispose();
     }

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java?rev=1833498&r1=1833497&r2=1833498&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeekerTest.java
 Thu Jun 14 08:08:38 2018
@@ -20,7 +20,8 @@ package org.apache.jackrabbit.oak.plugin
 
 import com.google.common.collect.Iterables;
 
-import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentStore;
+import 
org.apache.jackrabbit.oak.plugins.document.mongo.MongoMissingLastRevSeeker;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
 import org.junit.Before;
@@ -33,24 +34,34 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-public class MissingLastRevSeekerTest {
+public class MissingLastRevSeekerTest extends AbstractDocumentStoreTest {
 
     private Clock clock;
     private DocumentStore store;
     private MissingLastRevSeeker seeker;
 
+    public MissingLastRevSeekerTest(DocumentStoreFixture dsf) {
+        super(dsf);
+    }
+
     @Before
     public void before() throws Exception {
         clock = new Clock.Virtual();
         clock.waitUntil(System.currentTimeMillis());
         Revision.setClock(clock);
         ClusterNodeInfo.setClock(clock);
-        store = new MemoryDocumentStore();
-        seeker = new MissingLastRevSeeker(store, clock);
+        store = ds;
+        if (dsf == DocumentStoreFixture.MONGO) {
+            seeker = new MongoMissingLastRevSeeker((MongoDocumentStore) store, 
clock);
+        } else {
+            seeker = new MissingLastRevSeeker(store, clock);
+        }
+        removeMeClusterNodes.add("1");
+        removeMeClusterNodes.add("2");
     }
 
     @After
-    public void after() throws Exception {
+    public void after() {
         ClusterNodeInfo.resetClockToDefault();
         Revision.resetClockToDefault();
     }