Skip to content

Ceph object store: Fix LocationConstraint error #10772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
May 1, 2025
Merged

Ceph object store: Fix LocationConstraint error #10772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589277f
Don't set signingRegion as auto for creating the s3 client in ceph ob…
abh1sar Apr 24, 2025
865ed45
replace getBucketAcl with doesBucketExistV2 in CephObjectStoreDriverI…
abh1sar Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...c/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public Bucket createBucket(Bucket bucket, boolean objectLock) {
AmazonS3 s3client = getS3Client(storeId, accountId);

try {
if (s3client.getBucketAcl(bucketName) != null) {
throw new CloudRuntimeException("Bucket already exists with name " + bucketName);
if (s3client.doesBucketExistV2(bucketName)) {
throw new CloudRuntimeException("Bucket already exists with the name: " + bucketName);
}
} catch (AmazonS3Exception e) {
if (e.getStatusCode() != 404) {
Expand Down Expand Up @@ -221,9 +221,11 @@ public boolean createUser(long accountId, long storeId) {
if (user.isPresent()) {
logger.info("User already exists in Ceph RGW: " + username);
return true;
} else {
logger.debug("User does not exist. Creating user in Ceph RGW: " + username);
}
} catch (Exception e) {
logger.debug("User does not exist. Creating user in Ceph RGW: " + username);
logger.debug("Get user info failed for user {} with exception {}. Proceeding with user creation.", username, e.getMessage());
}

try {
Expand Down Expand Up @@ -348,7 +350,7 @@ protected AmazonS3 getS3Client(String url, String accessKey, String secretKey) {
new AWSStaticCredentialsProvider(
new BasicAWSCredentials(accessKey, secretKey)))
.withEndpointConfiguration(
new AwsClientBuilder.EndpointConfiguration(url, "auto"))
new AwsClientBuilder.EndpointConfiguration(url, null))
.build();

if (client == null) {
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void testCreateBucket() throws Exception {
when(bucketDao.findById(anyLong())).thenReturn(new BucketVO(bucket.getName()));
Bucket bucketRet = cephObjectStoreDriverImpl.createBucket(bucket, false);
assertEquals(bucketRet.getName(), bucket.getName());
verify(rgwClient, times(1)).getBucketAcl(anyString());
verify(rgwClient, times(1)).doesBucketExistV2(anyString());
verify(rgwClient, times(1)).createBucket(anyString());
}

Expand Down