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 mi...@apache.org on 2020/12/18 10:47:01 UTC
svn commit: r1884606 - in /jackrabbit/oak/trunk/oak-segment-tar/src:
main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/
test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/
Author: miroslav
Date: Fri Dec 18 10:47:01 2020
New Revision: 1884606
URL: http://svn.apache.org/viewvc?rev=1884606&view=rev
Log:
Squashed commit of the following:
commit 73bba651c0023e21a29a35c60f5709b1cb22db50
Author: miroslav <mi...@apache.org>
Date: Fri Dec 18 10:13:12 2020 +0100
OAK-9303 AbstractPersistentCache#readSegment should propagate exception RepositoryNotReachableException
Added:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/CachingPersistenceTest.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java?rev=1884606&r1=1884605&r2=1884606&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/AbstractPersistentCache.java Fri Dec 18 10:47:01 2020
@@ -24,6 +24,7 @@ import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.commons.Buffer;
+import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,6 +85,11 @@ public abstract class AbstractPersistent
}
return segment;
+ } catch (RepositoryNotReachableException e) {
+ recordCacheLoadTimeInternal(stopwatch.elapsed(TimeUnit.NANOSECONDS), false);
+
+ // rethrow exception so that this condition can be distinguished from other types of errors (see OAK-9303)
+ throw e;
} catch (Exception t) {
logger.error("Exception while loading segment {} from remote store or linked cache", new UUID(msb, lsb), t);
recordCacheLoadTimeInternal(stopwatch.elapsed(TimeUnit.NANOSECONDS), false);
Added: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/CachingPersistenceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/CachingPersistenceTest.java?rev=1884606&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/CachingPersistenceTest.java (added)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/CachingPersistenceTest.java Fri Dec 18 10:47:01 2020
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache;
+
+import org.apache.jackrabbit.oak.commons.Buffer;
+import org.apache.jackrabbit.oak.segment.Segment;
+import org.apache.jackrabbit.oak.segment.SegmentId;
+import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
+import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
+import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence;
+import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException;
+import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class CachingPersistenceTest {
+
+ @Rule
+ public TemporaryFolder folder = new TemporaryFolder(new File("target"));
+
+ private File getFileStoreFolder() {
+ return folder.getRoot();
+ }
+
+ @Test(expected = RepositoryNotReachableException.class)
+ public void testRepositoryNotReachableWithCachingPersistence() throws IOException, InvalidFileStoreVersionException {
+ FileStoreBuilder fileStoreBuilder;
+ FileStore fileStore = null;
+ try {
+
+ fileStoreBuilder = getFileStoreBuilderWithCachingPersistence(false);
+
+ fileStore = fileStoreBuilder.build();
+
+ SegmentId id = new SegmentId(fileStore, 5, 5);
+ byte[] buffer = new byte[2];
+ fileStore.writeSegment(id, buffer, 0, 2);
+
+ assertTrue(fileStore.containsSegment(id));
+ //close file store so that TarReader is used to read the segment
+ fileStore.close();
+
+ fileStoreBuilder = getFileStoreBuilderWithCachingPersistence(false);
+ fileStore = fileStoreBuilder.build();
+
+ Segment segment = fileStore.readSegment(id);
+ assertNotNull(segment);
+
+ fileStore.close();
+
+ // Construct file store that will simulate throwing RepositoryNotReachableException when reading a segment
+ fileStoreBuilder = getFileStoreBuilderWithCachingPersistence(true);
+ fileStore = fileStoreBuilder.build();
+
+ try {
+ fileStore.readSegment(id);
+ } catch (SegmentNotFoundException e) {
+ fail();
+ }
+ } finally {
+ if (fileStore != null) {
+ fileStore.close();
+ }
+ }
+ }
+
+ /**
+ * @param repoNotReachable - if set to true, {@code RepositoryNotReachableException} will be thrown when calling {@code SegmentArchiveReader}#readSegment
+ * @return
+ */
+ @NotNull
+ private FileStoreBuilder getFileStoreBuilderWithCachingPersistence(boolean repoNotReachable) {
+ FileStoreBuilder fileStoreBuilder;
+ fileStoreBuilder = fileStoreBuilder(getFileStoreFolder());
+ fileStoreBuilder.withSegmentCacheSize(10);
+
+ SegmentNodeStorePersistence customPersistence = new CachingPersistence(new MemoryPersistentCache(repoNotReachable), new TarPersistence(getFileStoreFolder()));
+ fileStoreBuilder.withCustomPersistence(customPersistence);
+ return fileStoreBuilder;
+ }
+
+ class MemoryPersistentCache extends AbstractPersistentCache {
+
+ private final Map<String, Buffer> segments = Collections.synchronizedMap(new HashMap<String, Buffer>());
+
+ private boolean throwException = false;
+
+ public MemoryPersistentCache(boolean throwException) {
+ this.throwException = throwException;
+ segmentCacheStats = new SegmentCacheStats(
+ "Memory Cache",
+ () -> null,
+ () -> null,
+ () -> null,
+ () -> null);
+ }
+
+ @Override
+ protected Buffer readSegmentInternal(long msb, long lsb) {
+ return segments.get(String.valueOf(msb) + lsb);
+ }
+
+ @Override
+ public boolean containsSegment(long msb, long lsb) {
+ return segments.containsKey(String.valueOf(msb) + lsb);
+ }
+
+ @Override
+ public void writeSegment(long msb, long lsb, Buffer buffer) {
+ segments.put(String.valueOf(msb) + lsb, buffer);
+ }
+
+ @Override
+ public Buffer readSegment(long msb, long lsb, @NotNull Callable<Buffer> loader) throws RepositoryNotReachableException {
+ return super.readSegment(msb, lsb, () -> {
+ if (throwException) {
+ throw new RepositoryNotReachableException(null);
+ }
+ return loader.call();
+ });
+ }
+
+ @Override
+ public void cleanUp() {
+
+ }
+ }
+}