Author: mreutegg
Date: Mon Jul 20 14:13:42 2015
New Revision: 1691949
URL: http://svn.apache.org/r1691949
Log:
OAK-3103: Stale document in MongoDocumentStore cache
Merged revisions 1691139,1691159,1691188 from trunk
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
- copied, changed from r1691139,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 20 14:13:42 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,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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,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,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691151,1691167,1691183,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,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,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,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,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1691949&r1=1691948&r2=1691949&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
Mon Jul 20 14:13:42 2015
@@ -49,7 +49,7 @@ public final class UpdateOp {
* @param id the primary key
* @param isNew whether this is a new document
*/
- UpdateOp(String id, boolean isNew) {
+ public UpdateOp(String id, boolean isNew) {
this(id, isNew, false, new HashMap<Key, Operation>(), null);
}
@@ -176,7 +176,7 @@ public final class UpdateOp {
* @param property the property name
* @param value the value
*/
- void set(String property, Object value) {
+ public void set(String property, Object value) {
Operation op = new Operation(Operation.Type.SET, value);
changes.put(new Key(property, null), op);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1691949&r1=1691948&r2=1691949&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
Mon Jul 20 14:13:42 2015
@@ -797,16 +797,11 @@ public class MongoDocumentStore implemen
QueryBuilder query = createQueryForUpdate(updateOp.getId(),
updateOp.getConditions());
query.and(Document.MOD_COUNT).is(modCount);
- DBObject fields = new BasicDBObject();
- // return _id only
- fields.put("_id", 1);
-
- DBObject oldNode = dbCollection.findAndModify(query.get(),
fields,
- null /*sort*/, false /*remove*/, update, false
/*returnNew*/,
- false /*upsert*/);
- if (oldNode != null) {
+
+ WriteResult result = dbCollection.update(query.get(), update);
+ if (result.getN() > 0) {
// success, update cached document
- applyToCache(collection, cachedDoc, updateOp);
+ putToCache(collection, cachedDoc, updateOp);
// return previously cached document
return cachedDoc;
}
@@ -820,9 +815,18 @@ public class MongoDocumentStore implemen
return null;
}
T oldDoc = convertFromDBObject(collection, oldNode);
- applyToCache(collection, oldDoc, updateOp);
if (oldDoc != null) {
+ putToCache(collection, oldDoc, updateOp);
oldDoc.seal();
+ } else if (upsert) {
+ if (collection == Collection.NODES) {
+ NodeDocument doc = (NodeDocument)
collection.newDocument(this);
+ UpdateUtils.applyChanges(doc, updateOp, comparator);
+ addToCache(doc);
+ }
+ } else {
+ // updateOp without conditions and not an upsert
+ // this means the document does not exist
}
return oldDoc;
} catch (Exception e) {
@@ -956,8 +960,7 @@ public class MongoDocumentStore implemen
// make sure concurrently loaded document is
invalidated
nodesCache.invalidate(new
StringValue(entry.getKey()));
} else {
- applyToCache(Collection.NODES,
entry.getValue(),
- updateOp.shallowCopy(entry.getKey()));
+ updateCache(Collection.NODES,
entry.getValue(), updateOp.shallowCopy(entry.getKey()));
}
} finally {
lock.unlock();
@@ -1135,6 +1138,10 @@ public class MongoDocumentStore implemen
return nodesCache.getIfPresent(new StringValue(id));
}
+ protected Cache<CacheValue, NodeDocument> getNodeDocumentCache() {
+ return nodesCache;
+ }
+
private static void log(String message, Object... args) {
if (LOG.isDebugEnabled()) {
String argList = Arrays.toString(args);
@@ -1162,43 +1169,34 @@ public class MongoDocumentStore implemen
*
* @param <T> the document type.
* @param collection the document collection.
- * @param oldDoc the old document or <code>null</code> if the update is for
- * a new document (insert).
+ * @param oldDoc the old document.
* @param updateOp the update operation.
*/
- private <T extends Document> void applyToCache(@Nonnull Collection<T>
collection,
- @Nullable T oldDoc,
- @Nonnull UpdateOp updateOp)
{
+ private <T extends Document> void updateCache(@Nonnull Collection<T>
collection,
+ @Nonnull T oldDoc,
+ @Nonnull UpdateOp updateOp) {
// cache the new document
if (collection == Collection.NODES) {
+ checkNotNull(oldDoc);
+ checkNotNull(updateOp);
+ // we can only update the cache based on the oldDoc if we
+ // still have the oldDoc in the cache, otherwise we may
+ // update the cache with an outdated document
CacheValue key = new StringValue(updateOp.getId());
- NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
- if (oldDoc != null) {
- // we can only update the cache based on the oldDoc if we
- // still have the oldDoc in the cache, otherwise we may
- // update the cache with an outdated document
- NodeDocument cached = nodesCache.getIfPresent(key);
- if (cached == null) {
- // cannot use oldDoc to update cache
- return;
- }
- oldDoc.deepCopy(newDoc);
- }
- UpdateUtils.applyChanges(newDoc, updateOp, comparator);
- newDoc.seal();
-
- NodeDocument cached = addToCache(newDoc);
- if (cached == newDoc) {
- // successful
- return;
- }
- if (oldDoc == null) {
- // this is an insert and some other thread was quicker
- // loading it into the cache -> return now
+ NodeDocument cached = nodesCache.getIfPresent(key);
+ if (cached == null) {
+ // cannot use oldDoc to update cache
return;
}
- // this is an update (oldDoc != null)
+
+ // check if the currently cached document matches oldDoc
if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
+ NodeDocument newDoc = (NodeDocument)
collection.newDocument(this);
+ oldDoc.deepCopy(newDoc);
+
+ UpdateUtils.applyChanges(newDoc, updateOp, comparator);
+ newDoc.seal();
+
nodesCache.put(key, newDoc);
} else {
// the cache entry was modified by some other thread in
@@ -1254,6 +1252,30 @@ public class MongoDocumentStore implemen
}
}
+ /**
+ * Unconditionally puts a document into the cache if {@code collection} is
+ * {@link Collection#NODES}. The document put into the cache is
+ * {@code oldDoc} with the {@code updateOp} applied. This method does not
+ * acquire a lock from {@link #locks}! The caller must ensure a lock is
held
+ * for the given document.
+ *
+ * @param collection the collection where oldDoc belongs to.
+ * @param oldDoc how the document looked before the update.
+ * @param updateOp the update just applied to the document.
+ */
+ private <T extends Document> void putToCache(@Nonnull Collection<T>
collection,
+ @Nonnull T oldDoc,
+ @Nonnull UpdateOp updateOp) {
+ if (collection == Collection.NODES) {
+ CacheValue key = new StringValue(oldDoc.getId());
+ NodeDocument newDoc = (NodeDocument) collection.newDocument(this);
+ oldDoc.deepCopy(newDoc);
+ UpdateUtils.applyChanges(newDoc, updateOp, comparator);
+ newDoc.seal();
+ nodesCache.put(key, newDoc);
+ }
+ }
+
@Nonnull
private static QueryBuilder createQueryForUpdate(String key,
Map<Key, Condition>
conditions) {
Copied:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
(from r1691139,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java&r1=1691139&r2=1691949&rev=1691949&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheConsistencyIT.java
Mon Jul 20 14:13:42 2015
@@ -33,7 +33,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -43,7 +42,6 @@ import static org.junit.Assert.assertTru
/**
* Test for OAK-3103
*/
-@Ignore
public class CacheConsistencyIT extends AbstractMongoConnectionTest {
private MongoDocumentStore store;
