Skip to content

Commit 20e4969

Browse files
authored
HDDS-11737. UnsupportedOperationException in S3 setBucketAcl (#7448)
1 parent b252181 commit 20e4969

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020

2121
import java.io.IOException;
2222
import java.time.Instant;
23+
import java.util.ArrayList;
24+
import java.util.Collections;
2325
import java.util.Iterator;
2426
import java.util.List;
2527
import java.util.Map;
2628
import java.util.NoSuchElementException;
2729

28-
import org.apache.commons.collections.ListUtils;
2930
import org.apache.hadoop.hdds.client.OzoneQuota;
3031
import org.apache.hadoop.hdds.conf.ConfigurationSource;
3132
import org.apache.hadoop.hdds.scm.client.HddsClientUtils;
@@ -124,7 +125,7 @@ protected OzoneVolume(Builder builder) {
124125
this.creationTime.getEpochSecond(), this.creationTime.getNano());
125126
}
126127
}
127-
this.acls = builder.acls;
128+
this.acls = new ArrayList<>(builder.acls);
128129
if (builder.conf != null) {
129130
this.listCacheSize = HddsClientUtils.getListCacheSize(builder.conf);
130131
}
@@ -203,7 +204,7 @@ public Instant getModificationTime() {
203204
* @return aclMap
204205
*/
205206
public List<OzoneAcl> getAcls() {
206-
return ListUtils.unmodifiableList(acls);
207+
return Collections.unmodifiableList(acls);
207208
}
208209

209210
/**

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/AbstractS3SDKV1Tests.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void testCreateBucket() {
220220

221221
@Test
222222
public void testBucketACLOperations() {
223-
// TODO: Uncomment assertions when bucket S3 ACL logic has been fixed
223+
// TODO HDDS-11738: Uncomment assertions when bucket S3 ACL logic has been fixed
224224
final String bucketName = getBucketName();
225225

226226
AccessControlList aclList = new AccessControlList();
@@ -235,15 +235,12 @@ public void testBucketACLOperations() {
235235

236236
s3Client.createBucket(createBucketRequest);
237237

238-
// AccessControlList retrievedAclList = s3.getBucketAcl(bucketName);
239-
// assertEquals(aclList, retrievedAclList);
238+
//assertEquals(aclList, s3Client.getBucketAcl(bucketName));
240239

241-
// aclList.grantPermission(grantee, Permission.Write);
242-
// s3.setBucketAcl(bucketName, aclList);
243-
244-
// retrievedAclList = s3.getBucketAcl(bucketName);
245-
// assertEquals(aclList, retrievedAclList);
240+
aclList.grantPermission(grantee, Permission.Write);
241+
s3Client.setBucketAcl(bucketName, aclList);
246242

243+
//assertEquals(aclList, s3Client.getBucketAcl(bucketName));
247244
}
248245

249246
@Test

0 commit comments

Comments
 (0)