Author: reschke
Date: Tue Dec 4 07:51:48 2018
New Revision: 1848127
URL: http://svn.apache.org/viewvc?rev=1848127&view=rev
Log:
OAK-7935: RDB*Store: createOrUpdate may fail on stale cache when document was
removed on different instance
Add test and minimal fix that ensures that the cache gets invalidated.
Modified:
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 4 07:51:48 2018
@@ -3,5 +3,5 @@
/jackrabbit/oak/trunk:1834823
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
/jackrabbit/oak/trunk/oak-core:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789441,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,180226
2,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160,1840226,1846057
-/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1830048,1830209,1834610,1834823,1838076,1840455,1842089
+/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1817772,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825065,1825442,1825470,1828349,1830048,1830209,1834610,1834823,1838076,1840455,1842089,1848073
/jackrabbit/trunk/oak-core:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1848127&r1=1848126&r2=1848127&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Tue Dec 4 07:51:48 2018
@@ -1312,6 +1312,9 @@ public class RDBDocumentStore implements
// updated by a different instance, get a
fresh one
LOG.debug("suspect update from different
instance (current modcount: {}), refetching: {}...",
newmodcount, update.getId());
+ if (collection == Collection.NODES) {
+ nodesCache.invalidate(update.getId());
+ }
oldDoc = readDocumentUncached(collection,
update.getId(), null);
if (oldDoc == null) {
LOG.debug("after refetch: {} is gone",
update.getId());
Modified:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1848127&r1=1848126&r2=1848127&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Tue Dec 4 07:51:48 2018
@@ -225,4 +225,34 @@ public class MultiDocumentStoreTest exte
assertEquals(2L, foo.get("_ds1"));
assertEquals(1L, foo.get("_ds2"));
}
+
+ @Test
+ public void testUpdateRemovedNode() {
+ String id = Utils.getIdFromPath("testUpdateRemovedNode");
+ removeMe.add(id);
+
+ UpdateOp op = new UpdateOp(id, true);
+ assertNull(ds1.createOrUpdate(Collection.NODES, op));
+ // get it into the cache
+ NodeDocument n = ds1.find(Collection.NODES, id);
+ assertNotNull(n);
+
+ // delete it through the other instance
+ ds2.remove(Collection.NODES, Collections.singletonList(id));
+
+ // assume still in the cache?
+ NodeDocument n2 = ds1.find(Collection.NODES, id);
+ assertNotNull(n2);
+
+ // create-or-update should at least work after one retry
+ // see OAK-7953 - note that the retry shouldn't be needed; see OAK-7745
+ // for more information
+ try {
+ UpdateOp op2 = new UpdateOp(id, true);
+ assertNull(ds1.createOrUpdate(Collection.NODES, op2));
+ } catch (DocumentStoreException ex) {
+ UpdateOp op2 = new UpdateOp(id, true);
+ assertNull(ds1.createOrUpdate(Collection.NODES, op2));
+ }
+ }
}
