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 re...@apache.org on 2015/11/05 14:15:03 UTC
svn commit: r1712757 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/
Author: reschke
Date: Thu Nov 5 13:15:03 2015
New Revision: 1712757
URL: http://svn.apache.org/viewvc?rev=1712757&view=rev
Log:
OAK-3449: DocumentNodeStore support for predefined clusterIds should use ClusterNodeInfos (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 5 13:15:03 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1706212,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711498,1712042,1712490,1712531
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695507,1695521,1695540,1696190,1696194,1696242,1696285,1696
375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711498,1712042,1712490,1712531
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Thu Nov 5 13:15:03 2015
@@ -245,10 +245,11 @@ public class ClusterNodeInfo {
* Create a cluster node info instance for the store, with the
*
* @param store the document store (for the lease)
+ * @param configuredClusterId the configured cluster id (or 0 for dynamic assignment)
* @return the cluster node info
*/
- public static ClusterNodeInfo getInstance(DocumentStore store) {
- return getInstance(store, MACHINE_ID, WORKING_DIR, false);
+ public static ClusterNodeInfo getInstance(DocumentStore store, int configuredClusterId) {
+ return getInstance(store, MACHINE_ID, WORKING_DIR, configuredClusterId, false);
}
/**
@@ -261,7 +262,7 @@ public class ClusterNodeInfo {
*/
public static ClusterNodeInfo getInstance(DocumentStore store, String machineId,
String instanceId) {
- return getInstance(store, machineId, instanceId, true);
+ return getInstance(store, machineId, instanceId, 0, true);
}
/**
@@ -270,21 +271,27 @@ public class ClusterNodeInfo {
* @param store the document store (for the lease)
* @param machineId the machine id (null for MAC address)
* @param instanceId the instance id (null for current working directory)
+ * @param configuredClusterId the configured cluster id (or 0 for dynamic assignment)
* @param updateLease whether to update the lease
* @return the cluster node info
*/
public static ClusterNodeInfo getInstance(DocumentStore store, String machineId,
- String instanceId, boolean updateLease) {
+ String instanceId, int configuredClusterId, boolean updateLease) {
+
+ // defaults for machineId and instanceID
if (machineId == null) {
machineId = MACHINE_ID;
}
if (instanceId == null) {
instanceId = WORKING_DIR;
}
- for (int i = 0; i < 10; i++) {
- ClusterNodeInfo clusterNode = createInstance(store, machineId, instanceId);
- UpdateOp update = new UpdateOp("" + clusterNode.id, true);
- update.set(ID, String.valueOf(clusterNode.id));
+
+ int retries = 10;
+ for (int i = 0; i < retries; i++) {
+ ClusterNodeInfo clusterNode = createInstance(store, machineId, instanceId, configuredClusterId);
+ String key = String.valueOf(clusterNode.id);
+ UpdateOp update = new UpdateOp(key, true);
+ update.set(ID, key);
update.set(MACHINE_ID_KEY, clusterNode.machineId);
update.set(INSTANCE_ID_KEY, clusterNode.instanceId);
if (updateLease) {
@@ -299,8 +306,8 @@ public class ClusterNodeInfo {
final boolean success;
if (clusterNode.newEntry) {
- //For new entry do a create. This ensures that if two nodes create
- //entry with same id then only one would succeed
+ // For new entry do a create. This ensures that if two nodes
+ // create entry with same id then only one would succeed
success = store.create(Collection.CLUSTER_NODES, Collections.singletonList(update));
} else {
// No expiration of earlier cluster info, so update
@@ -312,34 +319,58 @@ public class ClusterNodeInfo {
return clusterNode;
}
}
- throw new DocumentStoreException("Could not get cluster node info");
+ throw new DocumentStoreException("Could not get cluster node info (retried " + retries + " times)");
}
private static ClusterNodeInfo createInstance(DocumentStore store, String machineId,
- String instanceId) {
+ String instanceId, int configuredClusterId) {
+
long now = getCurrentTime();
- List<ClusterNodeInfoDocument> list = ClusterNodeInfoDocument.all(store);
int clusterNodeId = 0;
int maxId = 0;
ClusterNodeState state = ClusterNodeState.NONE;
Long prevLeaseEnd = null;
boolean newEntry = false;
- for (Document doc : list) {
+
+ ClusterNodeInfoDocument alreadyExistingConfigured = null;
+ String reuseFailureReason = "";
+ List<ClusterNodeInfoDocument> list = ClusterNodeInfoDocument.all(store);
+
+ for (ClusterNodeInfoDocument doc : list) {
+
String key = doc.getId();
+
int id;
try {
- id = Integer.parseInt(key);
+ id = doc.getClusterId();
} catch (Exception e) {
- // not an integer - ignore
+ LOG.debug("Skipping cluster node info document {} because ID is invalid", key);
continue;
}
+
maxId = Math.max(maxId, id);
+
+ // if a cluster id was configured: check that and abort if it does
+ // not match
+ if (configuredClusterId != 0) {
+ if (configuredClusterId != id) {
+ continue;
+ } else {
+ alreadyExistingConfigured = doc;
+ }
+ }
+
Long leaseEnd = (Long) doc.get(LEASE_END_KEY);
+
if (leaseEnd != null && leaseEnd > now) {
+ // TODO wait for lease end, see OAK-3449
+ reuseFailureReason = "leaseEnd " + leaseEnd + " > " + now + " - " + (leaseEnd - now) + "ms in the future";
continue;
}
+
String mId = "" + doc.get(MACHINE_ID_KEY);
String iId = "" + doc.get(INSTANCE_ID_KEY);
+
if (mId.startsWith(RANDOM_PREFIX)) {
// remove expired entries with random keys
store.remove(Collection.CLUSTER_NODES, key);
@@ -347,14 +378,15 @@ public class ClusterNodeInfo {
leaseEnd == null ? "n/a" : Utils.timestampToString(leaseEnd));
continue;
}
- if (!mId.equals(machineId) ||
- !iId.equals(instanceId)) {
+
+ if (!mId.equals(machineId) || !iId.equals(instanceId)) {
// a different machine or instance
+ reuseFailureReason = "machineId/instanceId do not match: " + mId + "/" + iId + " != " + machineId + "/" + instanceId;
continue;
}
- //and cluster node which matches current machine identity but
- //not being used
+ // a cluster node which matches current machine identity but
+ // not being used
if (clusterNodeId == 0 || id < clusterNodeId) {
// if there are multiple, use the smallest value
clusterNodeId = id;
@@ -363,11 +395,19 @@ public class ClusterNodeInfo {
}
}
- //No existing entry with matching signature found so
- //create a new entry
+ // No usable existing entry with matching signature found so
+ // create a new entry
if (clusterNodeId == 0) {
- clusterNodeId = maxId + 1;
newEntry = true;
+ if (configuredClusterId != 0) {
+ if (alreadyExistingConfigured != null) {
+ throw new DocumentStoreException(
+ "Configured cluster node id " + configuredClusterId + " already in use: " + reuseFailureReason);
+ }
+ clusterNodeId = configuredClusterId;
+ } else {
+ clusterNodeId = maxId + 1;
+ }
}
// Do not expire entries and stick on the earlier state, and leaseEnd so,
@@ -517,5 +557,4 @@ public class ClusterNodeInfo {
private static long getCurrentTime() {
return clock.getTime();
}
-
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Thu Nov 5 13:15:03 2015
@@ -205,6 +205,7 @@ public final class DocumentNodeStore
/**
* The cluster instance info.
*/
+ @Nonnull
private final ClusterNodeInfo clusterNodeInfo;
/**
@@ -278,8 +279,8 @@ public final class DocumentNodeStore
/**
* Background thread performing the clusterId lease renew.
- * Will be {@code null} if {@link #clusterNodeInfo} is {@code null}.
*/
+ @Nonnull
private Thread leaseUpdateThread;
/**
@@ -401,17 +402,15 @@ public final class DocumentNodeStore
this.changes = Collection.JOURNAL.newDocument(s);
this.executor = builder.getExecutor();
this.clock = builder.getClock();
+
int cid = builder.getClusterId();
cid = Integer.getInteger("oak.documentMK.clusterId", cid);
- if (cid == 0) {
- clusterNodeInfo = ClusterNodeInfo.getInstance(store);
- // TODO we should ensure revisions generated from now on
- // are never "older" than revisions already in the repository for
- // this cluster id
- cid = clusterNodeInfo.getId();
- } else {
- clusterNodeInfo = null;
- }
+ clusterNodeInfo = ClusterNodeInfo.getInstance(s, cid);
+ // TODO we should ensure revisions generated from now on
+ // are never "older" than revisions already in the repository for
+ // this cluster id
+ cid = clusterNodeInfo.getId();
+
this.clusterId = cid;
this.revisionComparator = new Revision.RevisionComparator(clusterId);
this.branches = new UnmergedBranches(getRevisionComparator());
@@ -500,13 +499,10 @@ public final class DocumentNodeStore
backgroundReadThread.start();
backgroundUpdateThread.start();
- if (clusterNodeInfo != null) {
- leaseUpdateThread = new Thread(
- new BackgroundLeaseUpdate(this, isDisposed),
- "DocumentNodeStore lease update thread " + threadNamePostfix);
- leaseUpdateThread.setDaemon(true);
- leaseUpdateThread.start();
- }
+ leaseUpdateThread = new Thread(new BackgroundLeaseUpdate(this, isDisposed),
+ "DocumentNodeStore lease update thread " + threadNamePostfix);
+ leaseUpdateThread.setDaemon(true);
+ leaseUpdateThread.start();
this.mbean = createMBean();
LOG.info("Initialized DocumentNodeStore with clusterNodeId: {} ({})", clusterId,
@@ -547,19 +543,15 @@ public final class DocumentNodeStore
// the background thread stopped
internalRunBackgroundUpdateOperations();
- if (leaseUpdateThread != null) {
- try {
- leaseUpdateThread.join();
- } catch (InterruptedException e) {
- // ignore
- }
+ try {
+ leaseUpdateThread.join();
+ } catch (InterruptedException e) {
+ // ignore
}
// now mark this cluster node as inactive by
// disposing the clusterNodeInfo
- if (clusterNodeInfo != null) {
- clusterNodeInfo.dispose();
- }
+ clusterNodeInfo.dispose();
store.dispose();
if (blobStore instanceof Closeable) {
@@ -576,7 +568,7 @@ public final class DocumentNodeStore
}
private String getClusterNodeInfoDisplayString() {
- return clusterNodeInfo == null ? "no cluster node info" : clusterNodeInfo.toString().replaceAll("[\r\n\t]", " ").trim();
+ return clusterNodeInfo.toString().replaceAll("[\r\n\t]", " ").trim();
}
Revision setHeadRevision(@Nonnull Revision newHead) {
@@ -724,7 +716,7 @@ public final class DocumentNodeStore
return enableConcurrentAddRemove;
}
- @CheckForNull
+ @Nonnull
public ClusterNodeInfo getClusterInfo() {
return clusterNodeInfo;
}
@@ -1704,7 +1696,7 @@ public final class DocumentNodeStore
* @return {@code true} if the lease was renewed; {@code false} otherwise.
*/
boolean renewClusterIdLease() {
- return clusterNodeInfo != null && clusterNodeInfo.renewLease();
+ return clusterNodeInfo.renewLease();
}
/**
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java Thu Nov 5 13:15:03 2015
@@ -52,8 +52,10 @@ public class CacheInvalidationIT extends
@Before
public void prepareStores() throws Exception {
- c1 = createNS(1);
- c2 = createNS(2);
+ // TODO start with clusterNodeId 2, because 1 has already been
+ // implicitly allocated in the base class
+ c1 = createNS(2);
+ c2 = createNS(3);
initialCacheSizeC1 = getCurrentCacheSize(c1);
initialCacheSizeC2 = getCurrentCacheSize(c2);
}
@@ -246,8 +248,12 @@ public class CacheInvalidationIT extends
@After
public void closeStores() {
- c1.dispose();
- c2.dispose();
+ if (c2 != null) {
+ c2.dispose();
+ }
+ if (c1 != null) {
+ c1.dispose();
+ }
}
private static void runBgOps(DocumentNodeStore... stores) {
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java Thu Nov 5 13:15:03 2015
@@ -57,9 +57,9 @@ public class JournalIT extends AbstractJ
Assume.assumeTrue(MongoUtils.isAvailable());
}
- @Before
- @After
- public void dropCollections() throws Exception {
+ @Override
+ public void clear() {
+ super.clear();
MongoConnection mongoConnection = connectionFactory.getConnection();
MongoUtils.dropCollections(mongoConnection.getDB());
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java Thu Nov 5 13:15:03 2015
@@ -25,6 +25,7 @@ import com.mongodb.ReadPreference;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -32,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.com
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.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -61,6 +63,13 @@ public class ReadPreferenceIT extends Ab
mongoDS = (MongoDocumentStore) mk.getDocumentStore();
}
+ @After
+ public void clearDB() {
+ if (mongoDS != null) {
+ MongoUtils.dropCollections(mongoDS.getDBCollection(NODES).getDB());
+ }
+ }
+
@Test
public void testPreferenceConversion() throws Exception{
//For cacheAge < replicationLag result should be primary
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakDocumentRDBRepositoryStub.java Thu Nov 5 13:15:03 2015
@@ -80,7 +80,6 @@ public class OakDocumentRDBRepositoryStu
String prefix = "T" + UUID.randomUUID().toString().replace("-", "");
RDBOptions options = new RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
DocumentNodeStore m = new DocumentMK.Builder().
- setClusterId(1).
memoryCacheSize(64 * 1024 * 1024).
setPersistentCache("target/persistentCache,time").
setRDBConnection(RDBDataSourceFactory.forJdbcUrl(url, username, password), options).
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java?rev=1712757&r1=1712756&r2=1712757&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoNSRepositoryStub.java Thu Nov 5 13:15:03 2015
@@ -75,9 +75,8 @@ public class OakMongoNSRepositoryStub ex
private static Repository createRepository(MongoConnection connection) {
DocumentNodeStore store = new DocumentMK.Builder().
- setClusterId(1).
memoryCacheSize(64 * 1024 * 1024).
- setPersistentCache("target/persistentCache,time").
+ setPersistentCache("target/persistentCache,time").
setMongoDB(connection.getDB()).
getNodeStore();
QueryEngineSettings qs = new QueryEngineSettings();