sijie closed pull request #1855: S3 offloader should throw an error on
receiving an empty ledger
URL: https://github.com/apache/incubator-pulsar/pull/1855
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloader.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloader.java
index 5e46350041..c5f4a894d4 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloader.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloader.java
@@ -114,6 +114,11 @@ static String indexBlockOffloadKey(long ledgerId, UUID
uuid) {
Map<String, String> extraMetadata) {
CompletableFuture<Void> promise = new CompletableFuture<>();
scheduler.chooseThread(readHandle.getId()).submit(() -> {
+ if (readHandle.getLength() == 0 || !readHandle.isClosed() ||
readHandle.getLastAddConfirmed() < 0) {
+ promise.completeExceptionally(
+ new IllegalArgumentException("An empty or open ledger
should never be offloaded"));
+ return;
+ }
OffloadIndexBlockBuilder indexBuilder =
OffloadIndexBlockBuilder.create()
.withLedgerMetadata(readHandle.getLedgerMetadata());
String dataBlockKey = dataBlockOffloadKey(readHandle.getId(),
uuid);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloaderTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloaderTest.java
index 9f0d253ab1..1b5ad0399b 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloaderTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/S3ManagedLedgerOffloaderTest.java
@@ -21,6 +21,7 @@
import static
org.apache.pulsar.broker.s3offload.S3ManagedLedgerOffloader.dataBlockOffloadKey;
import static
org.apache.pulsar.broker.s3offload.S3ManagedLedgerOffloader.indexBlockOffloadKey;
import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.services.s3.AmazonS3;
@@ -30,6 +31,7 @@
import java.util.Iterator;
import java.util.Random;
import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
@@ -422,5 +424,28 @@ public void testDeleteOffloadedFail() throws Exception {
Assert.assertTrue(mockS3client.doesObjectExist(BUCKET,
indexBlockOffloadKey(readHandle.getId(), uuid)));
}
}
+
+ @Test
+ public void testOffloadEmpty() throws Exception {
+ CompletableFuture<LedgerEntries> noEntries = new CompletableFuture<>();
+ noEntries.completeExceptionally(new BKException.BKReadException());
+
+ ReadHandle readHandle = Mockito.mock(ReadHandle.class);
+ Mockito.doReturn(-1L).when(readHandle).getLastAddConfirmed();
+ Mockito.doReturn(noEntries).when(readHandle).readAsync(anyLong(),
anyLong());
+ Mockito.doReturn(0L).when(readHandle).getLength();
+ Mockito.doReturn(true).when(readHandle).isClosed();
+ Mockito.doReturn(1234L).when(readHandle).getId();
+
+ UUID uuid = UUID.randomUUID();
+ LedgerOffloader offloader = new S3ManagedLedgerOffloader(s3client,
BUCKET, scheduler,
+
DEFAULT_BLOCK_SIZE, DEFAULT_READ_BUFFER_SIZE);
+ try {
+ offloader.offload(readHandle, uuid, new HashMap<>()).get();
+ Assert.fail("Shouldn't have been able to offload");
+ } catch (ExecutionException e) {
+ Assert.assertEquals(e.getCause().getClass(),
IllegalArgumentException.class);
+ }
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
