Skip to content

HDDS-11954. List keys command gets wrong info from BasicOmKeyInfo #8401

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
chungen0126 merged 11 commits into from
May 13, 2025
Merged

HDDS-11954. List keys command gets wrong info from BasicOmKeyInfo #8401

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7c1a06e
Fix OzoneBucket#toOzoneKey
kostacie May 5, 2025
63f4089
Added test
kostacie May 6, 2025
84b71be
Fix checkstyle
kostacie May 6, 2025
1170505
Fix checkstyle
kostacie May 6, 2025
e355261
Improve test
kostacie May 7, 2025
9413286
Move test
kostacie May 7, 2025
268e98f
Move test to TestListKeysWithFSO
kostacie May 11, 2025
77d8be0
Fix checkstyle
kostacie May 11, 2025
9f90882
Fix checkstyle
kostacie May 12, 2025
ff8c31f
Merge branch 'master' into hdds-11954_list_keys_command_gets_wrong_info
kostacie May 12, 2025
e1f75ec
Clean up
kostacie May 13, 2025
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
2 changes: 1 addition & 1 deletion hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,7 @@ private static OzoneKey toOzoneKey(OzoneFileStatusLight status) {
keyInfo.getModificationTime(),
keyInfo.getReplicationConfig(),
metadata,
keyInfo.isFile(),
status.isFile(),
keyInfo.getOwnerName(),
Collections.emptyMap());
}
Expand Down
24 changes: 24 additions & 0 deletions ...tion-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneKey;
import org.apache.hadoop.ozone.client.OzoneKeyDetails;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.client.VolumeArgs;
Expand Down Expand Up @@ -2588,4 +2589,27 @@ private void deleteFiles(Path base, List<String> fileNames) throws IOException {
}
}

@Test
void testIsFileFalseForDir() throws IOException {
Copy link
Contributor

@chungen0126 chungen0126 May 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should add the test here, as it's not an operation of FileSystem. Could you please move the test to TestListKeysWithFSO?

Copy link
Contributor Author

@kostacie kostacie May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Path dirPath = new Path(getBucketPath(), "dir1");
Path keyPath = new Path(dirPath, "key1");
OFSPath ofsPath = new OFSPath(dirPath, conf);

getFs().mkdirs(dirPath);
try (FSDataOutputStream out1 = getFs().create(keyPath)) {
out1.write(2);
}

OzoneBucket bucket = adapter.getBucket(ofsPath, false);

Iterator<? extends OzoneKey> keyIterator = bucket.listKeys("");

assertTrue(keyIterator.hasNext(), "Expected dir1, key1 in the bucket");
OzoneKey ozoneKey = keyIterator.next();
assertEquals("dir1/", ozoneKey.getName());
assertFalse(ozoneKey.isFile(), "Expected isFile to be false for directory key");
ozoneKey = keyIterator.next();
assertEquals("dir1/key1", ozoneKey.getName());
assertTrue(ozoneKey.isFile(), "Expected isFile to be true for key");
}
}
1 change: 0 additions & 1 deletion ...st/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTestWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,5 +225,4 @@ void testLeaseRecoverable() throws Exception {
TestLeaseRecovery.closeIgnoringKeyNotFound(stream);
}
}

}