You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ba...@apache.org on 2024/04/19 13:53:24 UTC
(pulsar) branch branch-3.1 updated: [improve][offload] Apply autoSkipNonRecoverableData configuration to tiered storage (#22531)
This is an automated email from the ASF dual-hosted git repository.
baodi pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 88243208ba7 [improve][offload] Apply autoSkipNonRecoverableData configuration to tiered storage (#22531)
88243208ba7 is described below
commit 88243208ba745f272d704dde7282b8ddc63fc30f
Author: Baodi Shi <ba...@apache.org>
AuthorDate: Fri Apr 19 21:51:10 2024 +0800
[improve][offload] Apply autoSkipNonRecoverableData configuration to tiered storage (#22531)
(cherry picked from commit fbf4cb71a3f3ed08786205dc5e60b810f3d62605)
---
.../impl/BlobStoreBackedInputStreamImpl.java | 8 ++++
.../jcloud/impl/BlobStoreBackedReadHandleImpl.java | 13 +++++-
.../impl/BlobStoreBackedReadHandleImplV2.java | 13 +++++-
.../jcloud/BlobStoreBackedInputStreamTest.java | 5 +-
...obStoreManagedLedgerOffloaderStreamingTest.java | 54 ++++++++++++++++++++++
.../impl/BlobStoreManagedLedgerOffloaderTest.java | 23 +++++++++
6 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
index 0dea46726f5..6cb60e14984 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedInputStreamImpl.java
@@ -28,6 +28,7 @@ import org.apache.bookkeeper.mledger.offload.jcloud.impl.DataBlockUtils.VersionC
import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
import org.apache.pulsar.common.naming.TopicName;
import org.jclouds.blobstore.BlobStore;
+import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.options.GetOptions;
import org.slf4j.Logger;
@@ -95,6 +96,9 @@ public class BlobStoreBackedInputStreamImpl extends BackedInputStream {
try {
long startReadTime = System.nanoTime();
Blob blob = blobStore.getBlob(bucket, key, new GetOptions().range(startRange, endRange));
+ if (blob == null) {
+ throw new KeyNotFoundException(bucket, key, "");
+ }
versionCheck.check(key, blob);
try (InputStream stream = blob.getPayload().openStream()) {
@@ -121,6 +125,10 @@ public class BlobStoreBackedInputStreamImpl extends BackedInputStream {
if (null != this.offloaderStats) {
this.offloaderStats.recordReadOffloadError(this.topicName);
}
+ // If the blob is not found, the original exception is thrown and handled by the caller.
+ if (e instanceof KeyNotFoundException) {
+ throw e;
+ }
throw new IOException("Error reading from BlobStore", e);
}
}
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
index 5346be6a044..4f68f90370e 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImpl.java
@@ -49,6 +49,7 @@ import org.apache.bookkeeper.mledger.offload.jcloud.impl.DataBlockUtils.VersionC
import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
import org.apache.pulsar.common.naming.TopicName;
import org.jclouds.blobstore.BlobStore;
+import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -202,7 +203,11 @@ public class BlobStoreBackedReadHandleImpl implements ReadHandle {
} catch (Throwable t) {
log.error("Failed to read entries {} - {} from the offloader in ledger {}",
firstEntry, lastEntry, ledgerId, t);
- promise.completeExceptionally(t);
+ if (t instanceof KeyNotFoundException) {
+ promise.completeExceptionally(new BKException.BKNoSuchLedgerExistsException());
+ } else {
+ promise.completeExceptionally(t);
+ }
entries.forEach(LedgerEntry::close);
}
});
@@ -265,7 +270,7 @@ public class BlobStoreBackedReadHandleImpl implements ReadHandle {
VersionCheck versionCheck,
long ledgerId, int readBufferSize,
LedgerOffloaderStats offloaderStats, String managedLedgerName)
- throws IOException {
+ throws IOException, BKException.BKNoSuchLedgerExistsException {
int retryCount = 3;
OffloadIndexBlock index = null;
IOException lastException = null;
@@ -278,6 +283,10 @@ public class BlobStoreBackedReadHandleImpl implements ReadHandle {
while (retryCount-- > 0) {
long readIndexStartTime = System.nanoTime();
Blob blob = blobStore.getBlob(bucket, indexKey);
+ if (blob == null) {
+ log.error("{} not found in container {}", indexKey, bucket);
+ throw new BKException.BKNoSuchLedgerExistsException();
+ }
offloaderStats.recordReadOffloadIndexLatency(topicName,
System.nanoTime() - readIndexStartTime, TimeUnit.NANOSECONDS);
versionCheck.check(indexKey, blob);
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
index 53d96e08abf..502f475174c 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreBackedReadHandleImplV2.java
@@ -49,6 +49,7 @@ import org.apache.bookkeeper.mledger.offload.jcloud.impl.DataBlockUtils.VersionC
import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
import org.apache.pulsar.common.naming.TopicName;
import org.jclouds.blobstore.BlobStore;
+import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -224,7 +225,11 @@ public class BlobStoreBackedReadHandleImplV2 implements ReadHandle {
}
}
} catch (Throwable t) {
- promise.completeExceptionally(t);
+ if (t instanceof KeyNotFoundException) {
+ promise.completeExceptionally(new BKException.BKNoSuchLedgerExistsException());
+ } else {
+ promise.completeExceptionally(t);
+ }
entries.forEach(LedgerEntry::close);
}
@@ -303,7 +308,7 @@ public class BlobStoreBackedReadHandleImplV2 implements ReadHandle {
VersionCheck versionCheck,
long ledgerId, int readBufferSize, LedgerOffloaderStats offloaderStats,
String managedLedgerName)
- throws IOException {
+ throws IOException, BKException.BKNoSuchLedgerExistsException {
List<BackedInputStream> inputStreams = new LinkedList<>();
List<OffloadIndexBlockV2> indice = new LinkedList<>();
String topicName = TopicName.fromPersistenceNamingEncoding(managedLedgerName);
@@ -313,6 +318,10 @@ public class BlobStoreBackedReadHandleImplV2 implements ReadHandle {
log.debug("open bucket: {} index key: {}", bucket, indexKey);
long startTime = System.nanoTime();
Blob blob = blobStore.getBlob(bucket, indexKey);
+ if (blob == null) {
+ log.error("{} not found in container {}", indexKey, bucket);
+ throw new BKException.BKNoSuchLedgerExistsException();
+ }
offloaderStats.recordReadOffloadIndexLatency(topicName,
System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
log.debug("indexKey blob: {} {}", indexKey, blob);
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
index 775310925a1..3e5c4b609df 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
@@ -32,6 +32,7 @@ import java.util.Random;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.mledger.offload.jcloud.impl.BlobStoreBackedInputStreamImpl;
import org.jclouds.blobstore.BlobStore;
+import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.io.Payload;
import org.jclouds.io.Payloads;
@@ -142,8 +143,8 @@ public class BlobStoreBackedInputStreamTest extends BlobStoreTestBase {
assertStreamsMatchByBytes(toTest, toCompare);
}
- @Test(expectedExceptions = IOException.class)
- public void testErrorOnRead() throws Exception {
+ @Test(expectedExceptions = KeyNotFoundException.class)
+ public void testNotFoundOnRead() throws Exception {
BackedInputStream toTest = new BlobStoreBackedInputStreamImpl(blobStore, BUCKET, "doesn't exist",
(key, md) -> {},
1234, 1000);
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
index 9056281a308..ad1529072f8 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderStreamingTest.java
@@ -18,16 +18,19 @@
*/
package org.apache.bookkeeper.mledger.offload.jcloud.impl;
+import static org.apache.bookkeeper.client.api.BKException.Code.NoSuchLedgerExistsException;
import static org.mockito.AdditionalAnswers.delegatesTo;
import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.Random;
import java.util.UUID;
+import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.api.LedgerEntries;
import org.apache.bookkeeper.client.api.LedgerEntry;
import org.apache.bookkeeper.client.api.ReadHandle;
@@ -445,4 +448,55 @@ public class BlobStoreManagedLedgerOffloaderStreamingTest extends BlobStoreManag
} catch (Exception e) {
}
}
+
+ @Test
+ public void testReadNotExistLedger() throws Exception {
+ LedgerOffloader offloader = getOffloader(new HashMap<String, String>() {{
+ put(TieredStorageConfiguration.MAX_OFFLOAD_SEGMENT_SIZE_IN_BYTES, "1000");
+ put(config.getKeys(TieredStorageConfiguration.METADATA_FIELD_MAX_BLOCK_SIZE).get(0), "5242880");
+ put(TieredStorageConfiguration.MAX_OFFLOAD_SEGMENT_ROLLOVER_TIME_SEC, "600");
+ }});
+ ManagedLedger ml = createMockManagedLedger();
+ UUID uuid = UUID.randomUUID();
+ long beginLedger = 0;
+ long beginEntry = 0;
+
+ Map<String, String> driverMeta = new HashMap<String, String>() {{
+ put(TieredStorageConfiguration.METADATA_FIELD_BUCKET, BUCKET);
+ }};
+ OffloadHandle offloadHandle = offloader
+ .streamingOffload(ml, uuid, beginLedger, beginEntry, driverMeta).get();
+
+ // Segment should closed because size in bytes full
+ final LinkedList<Entry> entries = new LinkedList<>();
+ for (int i = 0; i < 10; i++) {
+ final byte[] data = new byte[100];
+ random.nextBytes(data);
+ final EntryImpl entry = EntryImpl.create(0, i, data);
+ offloadHandle.offerEntry(entry);
+ entries.add(entry);
+ }
+
+ final LedgerOffloader.OffloadResult offloadResult = offloadHandle.getOffloadResultAsync().get();
+ assertEquals(offloadResult.endLedger, 0);
+ assertEquals(offloadResult.endEntry, 9);
+ final OffloadContext.Builder contextBuilder = OffloadContext.newBuilder();
+ contextBuilder.addOffloadSegment(
+ MLDataFormats.OffloadSegment.newBuilder()
+ .setUidLsb(uuid.getLeastSignificantBits())
+ .setUidMsb(uuid.getMostSignificantBits())
+ .setComplete(true).setEndEntryId(9).build());
+
+ final ReadHandle readHandle = offloader.readOffloaded(0, contextBuilder.build(), driverMeta).get();
+
+ // delete blob(ledger)
+ blobStore.removeBlob(BUCKET, uuid.toString());
+
+ try {
+ readHandle.read(0, 9);
+ fail("Should be read fail");
+ } catch (BKException e) {
+ assertEquals(e.getCode(), NoSuchLedgerExistsException);
+ }
+ }
}
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
index ac87a8e4240..6a66c19f68a 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.bookkeeper.mledger.offload.jcloud.impl;
+import static org.apache.bookkeeper.client.api.BKException.Code.NoSuchLedgerExistsException;
import static org.mockito.AdditionalAnswers.delegatesTo;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -26,6 +27,7 @@ import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -591,4 +593,25 @@ public class BlobStoreManagedLedgerOffloaderTest extends BlobStoreManagedLedgerO
throw e;
}
}
+
+ @Test
+ public void testReadNotExistLedger() throws Exception {
+ ReadHandle toWrite = buildReadHandle(DEFAULT_BLOCK_SIZE, 3);
+ LedgerOffloader offloader = getOffloader();
+
+ UUID uuid = UUID.randomUUID();
+ offloader.offload(toWrite, uuid, new HashMap<>()).get();
+ ReadHandle offloadRead = offloader.readOffloaded(toWrite.getId(), uuid, Collections.emptyMap()).get();
+ assertEquals(offloadRead.getLastAddConfirmed(), toWrite.getLastAddConfirmed());
+
+ // delete blob(ledger)
+ blobStore.removeBlob(BUCKET, DataBlockUtils.dataBlockOffloadKey(toWrite.getId(), uuid));
+
+ try {
+ offloadRead.read(0, offloadRead.getLastAddConfirmed());
+ fail("Should be read fail");
+ } catch (BKException e) {
+ assertEquals(e.getCode(), NoSuchLedgerExistsException);
+ }
+ }
}