This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 20e4969679 HDDS-11737. UnsupportedOperationException in S3
setBucketAcl (#7448)
20e4969679 is described below
commit 20e49696799f6cb5212e14d799de1b7983a00f71
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Nov 18 10:58:54 2024 +0100
HDDS-11737. UnsupportedOperationException in S3 setBucketAcl (#7448)
---
.../java/org/apache/hadoop/ozone/client/OzoneVolume.java | 7 ++++---
.../hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java | 13 +++++--------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
index 9ab110aa2b..e914b2db21 100644
---
a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
+++
b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
@@ -20,12 +20,13 @@ package org.apache.hadoop.ozone.client;
import java.io.IOException;
import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.ListUtils;
import org.apache.hadoop.hdds.client.OzoneQuota;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
@@ -124,7 +125,7 @@ public class OzoneVolume extends WithMetadata {
this.creationTime.getEpochSecond(), this.creationTime.getNano());
}
}
- this.acls = builder.acls;
+ this.acls = new ArrayList<>(builder.acls);
if (builder.conf != null) {
this.listCacheSize = HddsClientUtils.getListCacheSize(builder.conf);
}
@@ -203,7 +204,7 @@ public class OzoneVolume extends WithMetadata {
* @return aclMap
*/
public List<OzoneAcl> getAcls() {
- return ListUtils.unmodifiableList(acls);
+ return Collections.unmodifiableList(acls);
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java
index 15f1e10a63..d1ee677e0c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java
@@ -220,7 +220,7 @@ public abstract class AbstractS3SDKV1Tests extends
OzoneTestBase {
@Test
public void testBucketACLOperations() {
- // TODO: Uncomment assertions when bucket S3 ACL logic has been fixed
+ // TODO HDDS-11738: Uncomment assertions when bucket S3 ACL logic has been
fixed
final String bucketName = getBucketName();
AccessControlList aclList = new AccessControlList();
@@ -235,15 +235,12 @@ public abstract class AbstractS3SDKV1Tests extends
OzoneTestBase {
s3Client.createBucket(createBucketRequest);
-// AccessControlList retrievedAclList = s3.getBucketAcl(bucketName);
-// assertEquals(aclList, retrievedAclList);
+ //assertEquals(aclList, s3Client.getBucketAcl(bucketName));
-// aclList.grantPermission(grantee, Permission.Write);
-// s3.setBucketAcl(bucketName, aclList);
-
-// retrievedAclList = s3.getBucketAcl(bucketName);
-// assertEquals(aclList, retrievedAclList);
+ aclList.grantPermission(grantee, Permission.Write);
+ s3Client.setBucketAcl(bucketName, aclList);
+ //assertEquals(aclList, s3Client.getBucketAcl(bucketName));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
