Skip to content

HDDS-10424. Add more info regarding trailing slash during prefix creation #6328

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
adoroszlai merged 3 commits into from
Mar 5, 2024
Merged

HDDS-10424. Add more info regarding trailing slash during prefix creation #6328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68f325c
HDDS-10424. Add more info regarding trailing slash during prefix crea…
sarvekshayr Mar 4, 2024
fa74256
Additional changes
sarvekshayr Mar 5, 2024
809d4b8
Corrected the ResultCode
sarvekshayr Mar 5, 2024
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
8 changes: 4 additions & 4 deletions ...p-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ public void testInvalidPrefixAcl() throws IOException {
// add acl with invalid prefix name
Exception ex = assertThrows(OMException.class,
() -> writeClient.addAcl(ozInvalidPrefix, ozAcl1));
assertTrue(ex.getMessage().startsWith("Invalid prefix name"));
assertTrue(ex.getMessage().startsWith("Missing trailing slash"));

OzoneObj ozPrefix1 = new OzoneObjInfo.Builder()
.setVolumeName(volumeName)
Expand All @@ -659,20 +659,20 @@ public void testInvalidPrefixAcl() throws IOException {
// get acl with invalid prefix name
ex = assertThrows(OMException.class,
() -> writeClient.getAcl(ozInvalidPrefix));
assertTrue(ex.getMessage().startsWith("Invalid prefix name"));
assertTrue(ex.getMessage().startsWith("Missing trailing slash"));

// set acl with invalid prefix name
List<OzoneAcl> ozoneAcls = new ArrayList<OzoneAcl>();
ozoneAcls.add(ozAcl1);

ex = assertThrows(OMException.class,
() -> writeClient.setAcl(ozInvalidPrefix, ozoneAcls));
assertTrue(ex.getMessage().startsWith("Invalid prefix name"));
assertTrue(ex.getMessage().startsWith("Missing trailing slash"));

// remove acl with invalid prefix name
ex = assertThrows(OMException.class,
() -> writeClient.removeAcl(ozInvalidPrefix, ozAcl1));
assertTrue(ex.getMessage().startsWith("Invalid prefix name"));
assertTrue(ex.getMessage().startsWith("Missing trailing slash"));
}

@Test
Expand Down
5 changes: 3 additions & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/PrefixManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.BUCKET_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.PREFIX_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.VOLUME_NOT_FOUND;
import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.INVALID_PATH_IN_ACL_REQUEST;
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.PREFIX_LOCK;
import static org.apache.hadoop.ozone.security.acl.OzoneObj.ResourceType.PREFIX;

Expand Down Expand Up @@ -218,8 +219,8 @@ public void validateOzoneObj(OzoneObj obj) throws OMException {
throw new OMException("Prefix name is required.", PREFIX_NOT_FOUND);
}
if (!prefixName.endsWith("/")) {
throw new OMException("Invalid prefix name: " + prefixName,
PREFIX_NOT_FOUND);
throw new OMException("Missing trailing slash '/' in prefix name: " + prefixName,
INVALID_PATH_IN_ACL_REQUEST);
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMPrefixAclRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void testValidationFailure() {
);
OMClientResponse response1 =
invalidRequest1.validateAndUpdateCache(ozoneManager, 1);
assertEquals(OzoneManagerProtocolProtos.Status.PREFIX_NOT_FOUND,
assertEquals(OzoneManagerProtocolProtos.Status.INVALID_PATH_IN_ACL_REQUEST,
response1.getOMResponse().getStatus());

// Not a valid FS path
Expand Down