nsivabalan commented on code in PR #13126:
URL: https://github.com/apache/hudi/pull/13126#discussion_r2040674932
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/StorageBasedLockProvider.java:
##########
@@ -156,14 +153,20 @@ private static Functions.Function3<String, String,
TypedProperties, StorageLock>
String ownerId,
TypedProperties properties,
Functions.Function3<String, Long, Supplier<Boolean>, HeartbeatManager>
heartbeatManagerLoader,
- Functions.Function3<String, String, TypedProperties, StorageLock>
lockServiceLoader,
+ Functions.Function3<String, String, TypedProperties, StorageLockClient>
storageLockSupplier,
Review Comment:
minor. storageLockClientSupplier
##########
hudi-aws/src/main/java/org/apache/hudi/aws/transaction/lock/S3StorageLockClient.java:
##########
@@ -0,0 +1,252 @@
+/*
+ * 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.hudi.aws.transaction.lock;
+
+import org.apache.hudi.aws.credentials.HoodieAWSCredentialsProviderFactory;
+import org.apache.hudi.client.transaction.lock.StorageLockClient;
+import org.apache.hudi.client.transaction.lock.models.LockGetResult;
+import org.apache.hudi.client.transaction.lock.models.LockUpsertResult;
+import org.apache.hudi.client.transaction.lock.models.StorageLockData;
+import org.apache.hudi.client.transaction.lock.models.StorageLockFile;
+import org.apache.hudi.common.util.Functions;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.common.util.VisibleForTesting;
+import org.apache.hudi.common.util.collection.Pair;
+import org.apache.hudi.exception.HoodieLockException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+import javax.annotation.concurrent.ThreadSafe;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+/**
+ * S3-based distributed lock client using ETag checks (AWS SDK v2).
+ * See RFC: <a
href="https://github.com/apache/hudi/blob/master/rfc/rfc-91/rfc-91.md";>RFC-91</a>
+ */
+@ThreadSafe
+public class S3StorageLockClient implements StorageLockClient {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(S3StorageLockClient.class);
+ private static final int PRECONDITION_FAILURE_ERROR_CODE = 412;
+ private static final int NOT_FOUND_ERROR_CODE = 404;
+ private static final int CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE = 409;
+ private static final int RATE_LIMIT_ERROR_CODE = 429;
+ private static final int INTERNAL_SERVER_ERROR_CODE_MIN = 500;
+
+ private final Logger logger;
+ private final S3Client s3Client;
+ private final String bucketName;
+ private final String lockFilePath;
+ private final String ownerId;
+
+ /**
+ * Constructor that is used by reflection to instantiate an S3-based storage
locking client.
+ *
+ * @param ownerId The owner id.
+ * @param lockFileUri The full table base path where the lock will be
written.
+ * @param props The properties for the lock config, can be used to
customize client.
+ */
+ public S3StorageLockClient(String ownerId, String lockFileUri, Properties
props) {
+ this(ownerId, lockFileUri, props, createDefaultS3Client(), LOG);
+ }
+
+ @VisibleForTesting
+ S3StorageLockClient(String ownerId, String lockFileUri, Properties props,
Functions.Function2<String, Properties, S3Client> s3ClientSupplier, Logger
logger) {
+ try {
+ // This logic can likely be extended to other lock client
implementations.
+ // Consider creating base class with utilities, incl error handling.
+ URI uri = new URI(lockFileUri);
+ this.bucketName = uri.getHost();
+ this.lockFilePath = uri.getPath().replaceFirst("/", "");
+ this.s3Client = s3ClientSupplier.apply(bucketName, props);
+
+ if (StringUtils.isNullOrEmpty(this.bucketName)) {
+ throw new IllegalArgumentException("LockFileUri does not contain a
valid bucket name.");
+ }
+ if (StringUtils.isNullOrEmpty(this.lockFilePath)) {
+ throw new IllegalArgumentException("LockFileUri does not contain a
valid lock file path.");
+ }
+ this.ownerId = ownerId;
+ this.logger = logger;
+ } catch (URISyntaxException e) {
+ throw new HoodieLockException(e);
+ }
+ }
+
+ @Override
+ public Pair<LockGetResult, Option<StorageLockFile>> readCurrentLockFile() {
+ try (ResponseInputStream<GetObjectResponse> in = s3Client.getObject(
+ GetObjectRequest.builder()
+ .bucket(bucketName)
+ .key(lockFilePath)
+ .build())) {
+ String eTag = in.response().eTag();
+ return Pair.of(LockGetResult.SUCCESS,
Option.of(StorageLockFile.createFromStream(in, eTag)));
+ } catch (S3Exception e) {
+ int status = e.statusCode();
+ // Default to unknown error
+ LockGetResult result = LockGetResult.UNKNOWN_ERROR;
+ if (status == NOT_FOUND_ERROR_CODE) {
+ logger.info("OwnerId: {}, Object not found: {}", ownerId,
lockFilePath);
+ result = LockGetResult.NOT_EXISTS;
+ } else if (status == CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE) {
+ logger.info("OwnerId: {}, Conflicting operation has occurred: {}",
ownerId, lockFilePath);
+ } else if (status == RATE_LIMIT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Rate limit exceeded: {}", ownerId,
lockFilePath);
+ } else if (status >= INTERNAL_SERVER_ERROR_CODE_MIN) {
+ logger.warn("OwnerId: {}, S3 internal server error: {}", ownerId,
lockFilePath, e);
+ } else {
+ throw e;
+ }
+ return Pair.of(result, Option.empty());
+ } catch (IOException e) {
+ throw new UncheckedIOException("Failed reading lock file from S3: " +
lockFilePath, e);
+ }
+ }
+
+ @Override
+ public Pair<LockUpsertResult, Option<StorageLockFile>>
tryUpsertLockFile(StorageLockData newLockData, Option<StorageLockFile>
previousLockFile) {
+ boolean isCreate = previousLockFile.isEmpty();
+ String currentEtag = isCreate ? null :
previousLockFile.get().getVersionId();
+ LockUpsertResult result = LockUpsertResult.UNKNOWN_ERROR;
+ try {
+ StorageLockFile updated = createOrUpdateLockFileInternal(newLockData,
currentEtag);
+ return Pair.of(LockUpsertResult.SUCCESS, Option.of(updated));
+ } catch (S3Exception e) {
+ result = handleUpsertS3Exception(e);
+ } catch (AwsServiceException | SdkClientException e) {
+ logger.warn("OwnerId: {}, Unexpected SDK error while writing lock file:
{}", ownerId, lockFilePath, e);
+ if (isCreate) {
+ // We should always throw errors early when we are creating the lock
file.
+ // This is likely indicative of a larger issue that should bubble up
sooner.
+ throw e;
+ }
+ }
+
+ return Pair.of(result, Option.empty());
+ }
+
+ /**
+ * Internal helper to create or update the lock file with optional ETag
precondition.
+ */
+ private StorageLockFile createOrUpdateLockFileInternal(StorageLockData
lockData, String expectedEtag) {
+ byte[] bytes = StorageLockFile.toByteArray(lockData);
+ PutObjectRequest.Builder putRequestBuilder = PutObjectRequest.builder()
+ .bucket(bucketName)
+ .key(lockFilePath);
+
+ // ETag-based constraints:
+ // - If expectedEtag is not null:
+ // We assume that the file already exists on S3 with the ETag
"expectedEtag".
+ // The update operation will include an ifMatch(expectedEtag)
condition, meaning the update will only
+ // succeed if the current file's ETag exactly matches expectedEtag.
+ // If the actual ETag of the file on S3 differs from expectedEtag, the
update attempt will fail.
+ // - If expectedEtag is null:
+ // We assume that the file does not currently exist on S3.
+ // The operation will use ifNoneMatch("*"), which instructs S3 to
create the file only if it doesn't already exist.
+ // If a file with the same name is present (i.e., there is an existing
ETag), the creation attempt will fail.
+ if (expectedEtag == null) {
+ putRequestBuilder.ifNoneMatch("*");
+ } else {
+ putRequestBuilder.ifMatch(expectedEtag);
+ }
+
+ PutObjectResponse response = s3Client.putObject(putRequestBuilder.build(),
RequestBody.fromBytes(bytes));
+ String newEtag = response.eTag();
+
+ return new StorageLockFile(lockData, newEtag);
+ }
+
+ private LockUpsertResult handleUpsertS3Exception(S3Exception e) {
+ int status = e.statusCode();
+ if (status == PRECONDITION_FAILURE_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Lockfile modified by another process: {}",
ownerId, lockFilePath);
+ return LockUpsertResult.ACQUIRED_BY_OTHERS;
+ } else if (status == CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Retriable conditional request conflict error:
{}", ownerId, lockFilePath);
+ } else if (status == RATE_LIMIT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Rate limit exceeded for: {}", ownerId,
lockFilePath);
+ } else if (status >= INTERNAL_SERVER_ERROR_CODE_MIN) {
+ logger.warn("OwnerId: {}, internal server error for: {}", ownerId,
lockFilePath, e);
+ } else {
+ logger.error("OwnerId: {}, Error writing lock file: {}", ownerId,
lockFilePath, e);
+ }
+
+ return LockUpsertResult.UNKNOWN_ERROR;
+ }
+
+ private static Functions.Function2<String, Properties, S3Client>
createDefaultS3Client() {
+ return (bucketName, props) -> {
+ Region region;
+ boolean requiredFallbackRegion = false;
+ try {
+ region = DefaultAwsRegionProviderChain.builder().build().getRegion();
+ } catch (SdkClientException e) {
+ // Fallback to us-east-1 if no region is found
+ region = Region.US_EAST_1;
+ requiredFallbackRegion = true;
+ }
+
+ S3Client s3Client = S3Client.builder().credentialsProvider(
+
HoodieAWSCredentialsProviderFactory.getAwsCredentialsProvider(props)).region(region).build();
+ if (requiredFallbackRegion) {
+ GetBucketLocationResponse bucketLocationResponse =
s3Client.getBucketLocation(
+ GetBucketLocationRequest.builder().bucket(bucketName).build());
+ String regionString =
bucketLocationResponse.locationConstraintAsString();
+ if (!StringUtils.isNullOrEmpty(regionString)) {
Review Comment:
can we also check against default region. what incase bucket is actually in
Region.US_EAST_1. we do not need to reinstantiate right?
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/StorageBasedLockProvider.java:
##########
@@ -193,7 +196,7 @@ public boolean tryLock(long time, TimeUnit unit) {
if (tryLock()) {
return true;
}
- Thread.sleep(DEFAULT_LOCK_ACQUISITION_BUFFER_MS);
+
Thread.sleep(Long.parseLong(DEFAULT_LOCK_ACQUIRE_RETRY_WAIT_TIME_IN_MILLIS));
Review Comment:
again, trying to think of the necesity of this retry. we do have inherent
retries w/ LockManager which will kick in every configured value of
LOCK_ACQUIRE_CLIENT_RETRY_WAIT_TIME_IN_MILLIS_PROP_KEY
anyways. So, can you help explain the necessity of this?
also, if we have this, likely the retry from LockManager might be
ineffective?
or can you explain why do we need retries in both layers?
##########
hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/lock/StorageBasedLockProvider.java:
##########
@@ -125,16 +122,16 @@ public StorageBasedLockProvider(final LockConfiguration
lockConfiguration, final
UUID.randomUUID().toString(),
lockConfiguration.getConfig(),
LockProviderHeartbeatManager::new,
- getLockService(),
+ getStorageLockService(),
Review Comment:
rename to getStorageLockClient().
again, do remember to always align entities w/ getters.
##########
hudi-aws/src/main/java/org/apache/hudi/aws/transaction/lock/S3StorageLockClient.java:
##########
@@ -0,0 +1,252 @@
+/*
+ * 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.hudi.aws.transaction.lock;
+
+import org.apache.hudi.aws.credentials.HoodieAWSCredentialsProviderFactory;
+import org.apache.hudi.client.transaction.lock.StorageLockClient;
+import org.apache.hudi.client.transaction.lock.models.LockGetResult;
+import org.apache.hudi.client.transaction.lock.models.LockUpsertResult;
+import org.apache.hudi.client.transaction.lock.models.StorageLockData;
+import org.apache.hudi.client.transaction.lock.models.StorageLockFile;
+import org.apache.hudi.common.util.Functions;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.common.util.VisibleForTesting;
+import org.apache.hudi.common.util.collection.Pair;
+import org.apache.hudi.exception.HoodieLockException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+import javax.annotation.concurrent.ThreadSafe;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+/**
+ * S3-based distributed lock client using ETag checks (AWS SDK v2).
+ * See RFC: <a
href="https://github.com/apache/hudi/blob/master/rfc/rfc-91/rfc-91.md";>RFC-91</a>
+ */
+@ThreadSafe
+public class S3StorageLockClient implements StorageLockClient {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(S3StorageLockClient.class);
+ private static final int PRECONDITION_FAILURE_ERROR_CODE = 412;
+ private static final int NOT_FOUND_ERROR_CODE = 404;
+ private static final int CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE = 409;
+ private static final int RATE_LIMIT_ERROR_CODE = 429;
+ private static final int INTERNAL_SERVER_ERROR_CODE_MIN = 500;
+
+ private final Logger logger;
+ private final S3Client s3Client;
+ private final String bucketName;
+ private final String lockFilePath;
+ private final String ownerId;
+
+ /**
+ * Constructor that is used by reflection to instantiate an S3-based storage
locking client.
+ *
+ * @param ownerId The owner id.
+ * @param lockFileUri The full table base path where the lock will be
written.
+ * @param props The properties for the lock config, can be used to
customize client.
+ */
+ public S3StorageLockClient(String ownerId, String lockFileUri, Properties
props) {
+ this(ownerId, lockFileUri, props, createDefaultS3Client(), LOG);
+ }
+
+ @VisibleForTesting
+ S3StorageLockClient(String ownerId, String lockFileUri, Properties props,
Functions.Function2<String, Properties, S3Client> s3ClientSupplier, Logger
logger) {
+ try {
+ // This logic can likely be extended to other lock client
implementations.
+ // Consider creating base class with utilities, incl error handling.
+ URI uri = new URI(lockFileUri);
+ this.bucketName = uri.getHost();
+ this.lockFilePath = uri.getPath().replaceFirst("/", "");
+ this.s3Client = s3ClientSupplier.apply(bucketName, props);
+
+ if (StringUtils.isNullOrEmpty(this.bucketName)) {
+ throw new IllegalArgumentException("LockFileUri does not contain a
valid bucket name.");
+ }
+ if (StringUtils.isNullOrEmpty(this.lockFilePath)) {
+ throw new IllegalArgumentException("LockFileUri does not contain a
valid lock file path.");
+ }
+ this.ownerId = ownerId;
+ this.logger = logger;
+ } catch (URISyntaxException e) {
+ throw new HoodieLockException(e);
+ }
+ }
+
+ @Override
+ public Pair<LockGetResult, Option<StorageLockFile>> readCurrentLockFile() {
+ try (ResponseInputStream<GetObjectResponse> in = s3Client.getObject(
+ GetObjectRequest.builder()
+ .bucket(bucketName)
+ .key(lockFilePath)
+ .build())) {
+ String eTag = in.response().eTag();
+ return Pair.of(LockGetResult.SUCCESS,
Option.of(StorageLockFile.createFromStream(in, eTag)));
+ } catch (S3Exception e) {
+ int status = e.statusCode();
+ // Default to unknown error
+ LockGetResult result = LockGetResult.UNKNOWN_ERROR;
+ if (status == NOT_FOUND_ERROR_CODE) {
+ logger.info("OwnerId: {}, Object not found: {}", ownerId,
lockFilePath);
+ result = LockGetResult.NOT_EXISTS;
+ } else if (status == CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE) {
+ logger.info("OwnerId: {}, Conflicting operation has occurred: {}",
ownerId, lockFilePath);
+ } else if (status == RATE_LIMIT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Rate limit exceeded: {}", ownerId,
lockFilePath);
+ } else if (status >= INTERNAL_SERVER_ERROR_CODE_MIN) {
+ logger.warn("OwnerId: {}, S3 internal server error: {}", ownerId,
lockFilePath, e);
+ } else {
+ throw e;
+ }
+ return Pair.of(result, Option.empty());
+ } catch (IOException e) {
+ throw new UncheckedIOException("Failed reading lock file from S3: " +
lockFilePath, e);
+ }
+ }
+
+ @Override
+ public Pair<LockUpsertResult, Option<StorageLockFile>>
tryUpsertLockFile(StorageLockData newLockData, Option<StorageLockFile>
previousLockFile) {
+ boolean isCreate = previousLockFile.isEmpty();
+ String currentEtag = isCreate ? null :
previousLockFile.get().getVersionId();
+ LockUpsertResult result = LockUpsertResult.UNKNOWN_ERROR;
+ try {
+ StorageLockFile updated = createOrUpdateLockFileInternal(newLockData,
currentEtag);
+ return Pair.of(LockUpsertResult.SUCCESS, Option.of(updated));
+ } catch (S3Exception e) {
+ result = handleUpsertS3Exception(e);
+ } catch (AwsServiceException | SdkClientException e) {
+ logger.warn("OwnerId: {}, Unexpected SDK error while writing lock file:
{}", ownerId, lockFilePath, e);
+ if (isCreate) {
+ // We should always throw errors early when we are creating the lock
file.
+ // This is likely indicative of a larger issue that should bubble up
sooner.
+ throw e;
+ }
+ }
+
+ return Pair.of(result, Option.empty());
+ }
+
+ /**
+ * Internal helper to create or update the lock file with optional ETag
precondition.
+ */
+ private StorageLockFile createOrUpdateLockFileInternal(StorageLockData
lockData, String expectedEtag) {
+ byte[] bytes = StorageLockFile.toByteArray(lockData);
+ PutObjectRequest.Builder putRequestBuilder = PutObjectRequest.builder()
+ .bucket(bucketName)
+ .key(lockFilePath);
+
+ // ETag-based constraints:
+ // - If expectedEtag is not null:
+ // We assume that the file already exists on S3 with the ETag
"expectedEtag".
+ // The update operation will include an ifMatch(expectedEtag)
condition, meaning the update will only
+ // succeed if the current file's ETag exactly matches expectedEtag.
+ // If the actual ETag of the file on S3 differs from expectedEtag, the
update attempt will fail.
+ // - If expectedEtag is null:
+ // We assume that the file does not currently exist on S3.
+ // The operation will use ifNoneMatch("*"), which instructs S3 to
create the file only if it doesn't already exist.
+ // If a file with the same name is present (i.e., there is an existing
ETag), the creation attempt will fail.
+ if (expectedEtag == null) {
+ putRequestBuilder.ifNoneMatch("*");
+ } else {
+ putRequestBuilder.ifMatch(expectedEtag);
+ }
+
+ PutObjectResponse response = s3Client.putObject(putRequestBuilder.build(),
RequestBody.fromBytes(bytes));
+ String newEtag = response.eTag();
+
+ return new StorageLockFile(lockData, newEtag);
+ }
+
+ private LockUpsertResult handleUpsertS3Exception(S3Exception e) {
+ int status = e.statusCode();
+ if (status == PRECONDITION_FAILURE_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Lockfile modified by another process: {}",
ownerId, lockFilePath);
+ return LockUpsertResult.ACQUIRED_BY_OTHERS;
+ } else if (status == CONDITIONAL_REQUEST_CONFLICT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Retriable conditional request conflict error:
{}", ownerId, lockFilePath);
+ } else if (status == RATE_LIMIT_ERROR_CODE) {
+ logger.warn("OwnerId: {}, Rate limit exceeded for: {}", ownerId,
lockFilePath);
+ } else if (status >= INTERNAL_SERVER_ERROR_CODE_MIN) {
+ logger.warn("OwnerId: {}, internal server error for: {}", ownerId,
lockFilePath, e);
+ } else {
+ logger.error("OwnerId: {}, Error writing lock file: {}", ownerId,
lockFilePath, e);
+ }
+
+ return LockUpsertResult.UNKNOWN_ERROR;
+ }
+
+ private static Functions.Function2<String, Properties, S3Client>
createDefaultS3Client() {
+ return (bucketName, props) -> {
+ Region region;
+ boolean requiredFallbackRegion = false;
+ try {
+ region = DefaultAwsRegionProviderChain.builder().build().getRegion();
+ } catch (SdkClientException e) {
+ // Fallback to us-east-1 if no region is found
+ region = Region.US_EAST_1;
+ requiredFallbackRegion = true;
+ }
+
+ S3Client s3Client = S3Client.builder().credentialsProvider(
Review Comment:
is there a timeout that we need to configure for timeouts with S3 client
calls?
what incase the default timeout here is much larger than the retry internal
or timeout we have set in LockManager or StorageBasedLockProvider
##########
hudi-aws/src/main/java/org/apache/hudi/aws/transaction/lock/S3StorageLockClient.java:
##########
@@ -0,0 +1,252 @@
+/*
+ * 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.hudi.aws.transaction.lock;
+
+import org.apache.hudi.aws.credentials.HoodieAWSCredentialsProviderFactory;
+import org.apache.hudi.client.transaction.lock.StorageLockClient;
+import org.apache.hudi.client.transaction.lock.models.LockGetResult;
+import org.apache.hudi.client.transaction.lock.models.LockUpsertResult;
+import org.apache.hudi.client.transaction.lock.models.StorageLockData;
+import org.apache.hudi.client.transaction.lock.models.StorageLockFile;
+import org.apache.hudi.common.util.Functions;
+import org.apache.hudi.common.util.Option;
+import org.apache.hudi.common.util.StringUtils;
+import org.apache.hudi.common.util.VisibleForTesting;
+import org.apache.hudi.common.util.collection.Pair;
+import org.apache.hudi.exception.HoodieLockException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+
+import javax.annotation.concurrent.ThreadSafe;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+/**
+ * S3-based distributed lock client using ETag checks (AWS SDK v2).
+ * See RFC: <a
href="https://github.com/apache/hudi/blob/master/rfc/rfc-91/rfc-91.md";>RFC-91</a>
+ */
+@ThreadSafe
+public class S3StorageLockClient implements StorageLockClient {
Review Comment:
definitely the impl looks much leaner and easier to maintain.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
