sijie closed pull request #1798: S3ManagedLedgerOffloader should require region
or endpoint
URL: https://github.com/apache/incubator-pulsar/pull/1798
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 7a73a3bbc8..81ce362517 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
@@ -68,11 +68,13 @@ public static S3ManagedLedgerOffloader
create(ServiceConfiguration conf,
int maxBlockSize = conf.getS3ManagedLedgerOffloadMaxBlockSizeInBytes();
int readBufferSize =
conf.getS3ManagedLedgerOffloadReadBufferSizeInBytes();
- if (Strings.isNullOrEmpty(region)) {
- throw new PulsarServerException("s3ManagedLedgerOffloadRegion
cannot be empty is s3 offload enabled");
+ if (Strings.isNullOrEmpty(region) && Strings.isNullOrEmpty(endpoint)) {
+ throw new PulsarServerException(
+ "Either s3ManagedLedgerOffloadRegion or
s3ManagedLedgerOffloadServiceEndpoint must be set"
+ + " if s3 offload enabled");
}
if (Strings.isNullOrEmpty(bucket)) {
- throw new PulsarServerException("s3ManagedLedgerOffloadBucket
cannot be empty is s3 offload enabled");
+ throw new PulsarServerException("s3ManagedLedgerOffloadBucket
cannot be empty if s3 offload enabled");
}
AmazonS3ClientBuilder builder = AmazonS3ClientBuilder.standard();
----------------------------------------------------------------
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
