adoroszlai commented on code in PR #9462:
URL: https://github.com/apache/ozone/pull/9462#discussion_r2636875561
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequest.java:
##########
@@ -478,4 +478,28 @@ public static void addCreateVolumeToTable(String
volumeName,
.setOwnerName(UUID.randomUUID().toString()).build();
OMRequestTestUtils.addVolumeToOM(omMetadataManager, omVolumeArgs);
}
+
+ protected OMBucketCreateRequest doPreExecute(String volumeName,
+ String bucketName,
+
OzoneManagerProtocolProtos.BucketLayoutProto layout) throws Exception {
Review Comment:
nit: Please do not format method signature like this. Whenever visibility /
return type / method name / other modifiers are changed, we would have to
reindent all parameters.
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/bucket/TestOMBucketCreateRequestWithObjectStore.java:
##########
@@ -0,0 +1,72 @@
+/*
+ * 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.hadoop.ozone.om.request.bucket;
+
+import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newBucketInfoBuilder;
+import static
org.apache.hadoop.ozone.om.request.OMRequestTestUtils.newCreateBucketRequest;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.UUID;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests bucket creation behavior for ObjectStore / Legacy bucket layouts.
+ */
+public class TestOMBucketCreateRequestWithObjectStore extends
TestOMBucketCreateRequest {
+
+ @BeforeEach
+ public void setupWithObjectStore() {
+ ozoneManager.getConfiguration().set(
+ OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
+ OMConfigKeys.OZONE_BUCKET_LAYOUT_OBJECT_STORE);
+ }
+
+ @Test
+ public void testNonS3BucketNameRejectedForObjectStoreWhenStrictDisabled()
+ throws Exception {
+
+ // strict mode disabled
+ ozoneManager.getConfiguration().setBoolean(
+ OMConfigKeys.OZONE_OM_NAMESPACE_STRICT_S3, false);
+
+ String volumeName = UUID.randomUUID().toString();
+ String bucketName = "bucket_with_underscore"; // non-S3-compliant
+ addCreateVolumeToTable(volumeName, omMetadataManager);
+
+ // Explicitly set bucket layout to OBJECT_STORE so the test doesn't depend
on
+ // defaults or mocked OM behavior.
+ OzoneManagerProtocolProtos.BucketInfo.Builder bucketInfo =
+ newBucketInfoBuilder(bucketName, volumeName)
+ .setBucketLayout(
+ OzoneManagerProtocolProtos.BucketLayoutProto.OBJECT_STORE);
Review Comment:
Then we don't need this new test class, test case can be added in
`TestOMBucketCreateRequest`.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketCreateRequest.java:
##########
@@ -93,9 +94,17 @@ public OMRequest preExecute(OzoneManager ozoneManager)
throws IOException {
CreateBucketRequest createBucketRequest =
getOmRequest().getCreateBucketRequest();
BucketInfo bucketInfo = createBucketRequest.getBucketInfo();
- // Verify resource name
- OmUtils.validateBucketName(bucketInfo.getBucketName(),
- ozoneManager.isStrictS3());
+
+ BucketLayout bucketLayout =
BucketLayout.fromProto(bucketInfo.getBucketLayout());
+ OmConfig omConfig = ozoneManager.getConfig();
+ boolean fsPathEnabled = false;
+ if (omConfig != null) {
+ fsPathEnabled = omConfig.isFileSystemPathEnabled();
+ }
Review Comment:
Instead of adding this logic, please mock `ozoneManager.getConfig()` in
`TestOMClientRequestWithUserInfo`:
https://github.com/apache/ozone/blob/66cb1e72606e206352f54282e7f19461ad7761bc/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/TestOMClientRequestWithUserInfo.java#L80
like:
https://github.com/apache/ozone/blob/66cb1e72606e206352f54282e7f19461ad7761bc/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMDirectoryCreateRequest.java#L101-L102
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
