HDDS-12094. Update BasicKeyInfo to include isFile payload #7740
+44
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ptlrs
force-pushed
the
HDDS-12094-isfile
branch
from
0cb669b to
c5e588f
Compare
ptlrs
commented
Jan 24, 2025
Comment on lines
+2842
to
+2844
| @Test | ||
| public void testListKeyDirectoriesAreNotFiles() | ||
| throws IOException { |
There was a problem hiding this comment.
Could not add this test to testListKey due to checkstyle limit of 150 lines per method. Created a new test instead.
There was a problem hiding this comment.
Is it possible to use ParameterizedTest in testListKey to include the NotFile cases you added here?
jojochuang
reviewed
Jan 24, 2025
| @@ -1182,6 +1182,7 @@ message BasicKeyInfo { | |||
| optional hadoop.hdds.ECReplicationConfig ecReplicationConfig = 7; | |||
| optional string eTag = 8; | |||
| optional string ownerName = 9; | |||
| optional bool isFile = 10; | |||
There was a problem hiding this comment.
BasicKeyInfo was added in HDDS-9079 (1.4.0).
| @@ -254,7 +255,7 @@ public static BasicOmKeyInfo getFromProtobuf(String volumeName, | |||
| basicKeyInfo.getFactor(), | |||
| basicKeyInfo.getEcReplicationConfig())) | |||
| .setETag(basicKeyInfo.getETag()) | |||
| .setIsFile(!keyName.endsWith("/")) | |||
| .setIsFile(basicKeyInfo.getIsFile()) | |||
There was a problem hiding this comment.
If an old client send a request containing BasicKeyInfo to a new OM, the isFile field will not be set and a file would always be identified as not a file.
There was a problem hiding this comment.
@ptlrs can you please add test case in hadoop-ozone/dist/src/main/smoketest/compatibility/read.robot?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
The name of directories and subdirectories do not have a trailing slash.
This results in them being interpreted as files instead of directories.
As a result
isFile()incorrectly returnstrueeven for directories.This PR :
isFilepayload to theBasicKeyInfoproto messageBasicOmKeyInfoto get/set theisFilestatusWhat is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-12094
How was this patch tested?
Added new integration test in
OzoneRpcClientTests#testListKey.CI: https://github.com/ptlrs/ozone/actions/runs/12945031804