You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2017/04/03 12:11:39 UTC
svn commit: r1789978 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document:
AbstractMongoConnectionTest.java mongo/ReadPreferenceIT.java
Author: mreutegg
Date: Mon Apr 3 12:11:39 2017
New Revision: 1789978
URL: http://svn.apache.org/viewvc?rev=1789978&view=rev
Log:
OAK-6022: ReadPreferenceIT uses incorrect clock
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java?rev=1789978&r1=1789977&r2=1789978&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMongoConnectionTest.java Mon Apr 3 12:11:39 2017
@@ -48,10 +48,19 @@ public abstract class AbstractMongoConne
public void setUpConnection() throws Exception {
mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
- Revision.setClock(getTestClock());
+ setRevisionClock(getTestClock());
+ setClusterNodeInfoClock(getTestClock());
mk = newBuilder(mongoConnection.getDB()).open();
}
+ protected void setRevisionClock(Clock c) {
+ Revision.setClock(c);
+ }
+
+ protected void setClusterNodeInfoClock(Clock c) {
+ ClusterNodeInfo.setClock(c);
+ }
+
protected DocumentMK.Builder newBuilder(DB db) throws Exception {
return addToBuilder(new DocumentMK.Builder()).clock(getTestClock()).setMongoDB(db);
}
@@ -71,6 +80,7 @@ public abstract class AbstractMongoConne
MongoUtils.dropCollections(db);
db.getMongo().close();
Revision.resetClockToDefault();
+ ClusterNodeInfo.resetClockToDefault();
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java?rev=1789978&r1=1789977&r2=1789978&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java Mon Apr 3 12:11:39 2017
@@ -21,14 +21,21 @@ package org.apache.jackrabbit.oak.plugin
import com.mongodb.ReadPreference;
-import org.apache.jackrabbit.oak.plugins.document.*;
+import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeState;
+import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
+import org.apache.jackrabbit.oak.plugins.document.Revision;
+import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.plugins.document.mongo.replica.ReplicaSetInfo;
import org.apache.jackrabbit.oak.plugins.document.mongo.replica.ReplicaSetInfoMock;
+import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -55,18 +62,25 @@ public class ReadPreferenceIT extends Ab
@Override
public void setUpConnection() throws Exception {
clock = new Clock.Virtual();
+ setRevisionClock(clock);
+ setClusterNodeInfoClock(clock);
mongoConnection = connectionFactory.getConnection();
+ MongoUtils.dropCollections(mongoConnection.getDB());
replica = ReplicaSetInfoMock.create(clock);
mk = new DocumentMK.Builder()
+ .clock(clock)
.setClusterId(1)
.setMongoDB(mongoConnection.getDB())
.setLeaseCheck(false)
.open();
mongoDS = (MongoDocumentStore) mk.getDocumentStore();
+ // use a separate connection for cluster node 2
+ MongoConnection mongoConnection2 = connectionFactory.getConnection();
mk2 = new DocumentMK.Builder()
+ .clock(clock)
.setClusterId(2)
- .setMongoDB(mongoConnection.getDB())
+ .setMongoDB(mongoConnection2.getDB())
.setLeaseCheck(false)
.open();
}
@@ -80,6 +94,13 @@ public class ReadPreferenceIT extends Ab
mongoDS.setReplicaInfo(replica);
}
+ @After
+ public void tearDown() {
+ // reset readWrite mode before shutting down
+ mongoDS.setReadWriteMode("");
+ mk2.dispose();
+ }
+
@Test
public void testPreferenceConversion() throws Exception{
primary.addRevisions(200);