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 2019/03/06 12:26:46 UTC
svn commit: r1854917 - in /jackrabbit/oak/branches/1.6/oak-core: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
Author: reschke
Date: Wed Mar 6 12:26:45 2019
New Revision: 1854917
URL: http://svn.apache.org/viewvc?rev=1854917&view=rev
Log:
OAK-8051: PersistentCache: error during open can lead to incomplete initialization and subsequent NPEs (ported to 1.6)
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/persistentCache/CacheMap.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 6 12:26:45 2019
@@ -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,1848073,1852451,1852492
+/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,1852451,1852492,1854455,1854701
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java?rev=1854917&r1=1854916&r2=1854917&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheMap.java Wed Mar 6 12:26:45 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.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java?rev=1854917&r1=1854916&r2=1854917&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/CacheTest.java Wed Mar 6 12:26:45 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"));