Author: reschke
Date: Wed Mar 6 08:11:56 2019
New Revision: 1854899
URL: http://svn.apache.org/viewvc?rev=1854899&view=rev
Log:
OAK-8051: PersistentCache: error during open can lead to incomplete
initialization and subsequent NPEs (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 6 08:11:56 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044,1854461,1854466,1854515
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822182,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828827,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347
,1830748,1830911,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843621,1843652,1843911,1844070,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846581,1846617,1847096,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1850
874,1851533-1851535,1851619,1852120,1852451,1852492,1852528,1852582,1852584,1853141,1853229,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854044,1854455,1854461,1854466,1854515,1854701
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java?rev=1854899&r1=1854898&r2=1854899&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
Wed Mar 6 08:11:56 2019
@@ -25,14 +25,19 @@ import org.slf4j.LoggerFactory;
/**
* A cache map. This map supports re-opening the store if this is needed.
- *
+ * <p>
+ * Note that a failure to open the underlying store will be handled gracefully,
+ * in that the {@code CacheMap} can be constructed, but will not actually cache
+ * anything. The same is true for the case where the underlying store starts to
+ * fail and can not be re-opened.
+ *
* @param <K> the key type
* @param <V> the value type
*/
public class CacheMap<K, V> {
-
+
static final Logger LOG = LoggerFactory.getLogger(CacheMap.class);
-
+
private final MapFactory factory;
private final String name;
private final MVMap.Builder<K, V> builder;
@@ -40,14 +45,21 @@ public class CacheMap<K, V> {
private volatile Map<K, V> map;
private volatile boolean closed;
-
+
public CacheMap(MapFactory factory, String name, Builder<K, V> builder) {
this.factory = factory;
this.name = name;
this.builder = builder;
openMap();
+ // OAK-8051: if opening failed, immediately try to re-open,
+ // until either the the map is closed, or open
+ for (int i = 0; map == null && !closed; i++) {
+ if (map == null) {
+ reopen(i, null);
+ }
+ }
}
-
+
private void reopen(int i, Exception e) {
if (i > 10) {
LOG.warn("Too many re-opens; disabling this cache map", e);
@@ -64,7 +76,7 @@ public class CacheMap<K, V> {
}
openMap();
}
-
+
public V put(K key, V value) {
for (int i = 0;; i++) {
if (closed) {
@@ -77,7 +89,7 @@ public class CacheMap<K, V> {
}
}
}
-
+
public V get(Object key) {
for (int i = 0;; i++) {
if (closed) {
@@ -90,7 +102,7 @@ public class CacheMap<K, V> {
}
}
}
-
+
public boolean containsKey(Object key) {
for (int i = 0;; i++) {
if (closed) {
@@ -101,9 +113,9 @@ public class CacheMap<K, V> {
} catch (Exception e) {
reopen(i, e);
}
- }
+ }
}
-
+
public V remove(Object key) {
for (int i = 0;; i++) {
if (closed) {
@@ -114,7 +126,7 @@ public class CacheMap<K, V> {
} catch (Exception e) {
reopen(i, e);
}
- }
+ }
}
public void clear() {
@@ -128,9 +140,9 @@ public class CacheMap<K, V> {
} catch (Exception e) {
reopen(i, e);
}
- }
+ }
}
-
+
void openMap() {
openCount = factory.reopenStoreIfNeeded(openCount);
Map<K, V> m2 = factory.openMap(name, builder);
@@ -138,5 +150,4 @@ public class CacheMap<K, V> {
map = m2;
}
}
-
}
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java?rev=1854899&r1=1854898&r2=1854899&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
Wed Mar 6 08:11:56 2019
@@ -28,8 +28,10 @@ import java.io.FileOutputStream;
import java.util.Random;
import com.google.common.cache.Cache;
+
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
+import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.apache.jackrabbit.oak.plugins.document.PathRev;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
@@ -37,36 +39,49 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.junit.Test;
+import org.slf4j.event.Level;
public class CacheTest {
@Test
public void recoverIfCorrupt() throws Exception {
- FileUtils.deleteDirectory(new File("target/cacheTest"));
- new File("target/cacheTest").mkdirs();
- FileOutputStream out = new
FileOutputStream("target/cacheTest/cache-0.data");
- out.write("corrupt".getBytes());
- out.close();
- PersistentCache pCache = new PersistentCache("target/cacheTest");
- CacheLIRS<PathRev, StringValue> cache = new CacheLIRS.Builder<PathRev,
StringValue>().
- maximumSize(1).build();
- Cache<PathRev, StringValue> map = pCache.wrap(null, null, cache,
CacheType.DIFF);
- String largeString = new String(new char[1024 * 1024]);
- for (int counter = 0; counter < 10; counter++) {
- long end = System.currentTimeMillis() + 100;
- while (System.currentTimeMillis() < end) {
- Thread.yield();
- }
- for (int i = 0; i < 100; i++) {
- PathRev k = new PathRev("/" + counter, new RevisionVector(new
Revision(0, 0, i)));
- map.getIfPresent(k);
- map.put(k, new StringValue(largeString));
+ String expectedWarning = "Too many re-opens";
+ LogCustomizer lc =
LogCustomizer.forLogger(CacheMap.class).enable(Level.WARN).contains(expectedWarning).create();
+
+ try {
+ lc.starting();
+
+ FileUtils.deleteDirectory(new File("target/cacheTest"));
+ new File("target/cacheTest").mkdirs();
+ FileOutputStream out = new
FileOutputStream("target/cacheTest/cache-0.data");
+ out.write("corrupt".getBytes());
+ out.close();
+ PersistentCache pCache = new PersistentCache("target/cacheTest");
+ CacheLIRS<PathRev, StringValue> cache = new
CacheLIRS.Builder<PathRev, StringValue>().
+ maximumSize(1).build();
+ Cache<PathRev, StringValue> map = pCache.wrap(null, null, cache,
CacheType.DIFF);
+ String largeString = new String(new char[1024 * 1024]);
+ for (int counter = 0; counter < 10; counter++) {
+ long end = System.currentTimeMillis() + 100;
+ while (System.currentTimeMillis() < end) {
+ Thread.yield();
+ }
+ for (int i = 0; i < 100; i++) {
+ PathRev k = new PathRev("/" + counter, new
RevisionVector(new Revision(0, 0, i)));
+ map.getIfPresent(k);
+ map.put(k, new StringValue(largeString));
+ }
}
+ assertTrue("Exceptions: " + pCache.getExceptionCount(),
+ pCache.getExceptionCount() < 100);
+
+ assertTrue("WARN level log should contain one entry containing '"
+ expectedWarning + "'", lc.getLogs().size() == 1);
+ }
+ finally {
+ lc.finished();
}
- assertTrue("Exceptions: " + pCache.getExceptionCount(),
- pCache.getExceptionCount() < 100);
}
-
+
@Test
public void closeAlways() throws Exception {
FileUtils.deleteDirectory(new File("target/cacheTest"));
