Skip to content

HDDS-6474. Fixed File System Optimized(FSO) bucket list status. #3379

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
umamaheswararao merged 5 commits into from
Jun 1, 2022
Merged

HDDS-6474. Fixed File System Optimized(FSO) bucket list status. #3379

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f40e7b4
HDDS-6474. Fixed File System Optimized(FSO) bucket list status.
aswinshakil May 2, 2022
4993d8c
HDDS-6474. Added test and updated parameters.
aswinshakil May 5, 2022
016e889
Added JavaDoc and updated comments.
aswinshakil May 11, 2022
311b32b
Updated TableCache iteration condition.
aswinshakil May 13, 2022
f640469
Undo KeyManagerImpl changes
aswinshakil May 31, 2022
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
17 changes: 14 additions & 3 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,8 @@ public List<OzoneFileStatus> listStatusFSO(OmKeyArgs args, boolean recursive,
}


return buildFinalStatusList(cacheFileMap, cacheDirMap, args, clientAddress);
return buildFinalStatusList(cacheFileMap, cacheDirMap, args,
clientAddress, numEntries);

}

Expand All @@ -1873,18 +1874,27 @@ public List<OzoneFileStatus> listStatusFSO(OmKeyArgs args, boolean recursive,
private List<OzoneFileStatus> buildFinalStatusList(
Map<String, OzoneFileStatus> cacheFileMap,
Map<String, OzoneFileStatus> cacheDirMap, OmKeyArgs omKeyArgs,
String clientAddress)
String clientAddress, long numEntries)
throws IOException {
List<OmKeyInfo> keyInfoList = new ArrayList<>();
List<OzoneFileStatus> fileStatusFinalList = new ArrayList<>();

long countEntries = 0;
for (OzoneFileStatus fileStatus : cacheFileMap.values()) {
fileStatusFinalList.add(fileStatus);
keyInfoList.add(fileStatus.getKeyInfo());
countEntries++;
if (countEntries >= numEntries) {
Copy link
Contributor

@kerneltime kerneltime May 3, 2022

Choose a reason for hiding this comment

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

Do the keys in the fileStatusFinalList be a sum of both file and dir caches sorted and then truncated to the numEntries? I think the overall code for listStatusFSO needs to be revisited.

Copy link
Member Author

@aswinshakil aswinshakil May 5, 2022

Choose a reason for hiding this comment

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

Yes, It does. Along with that we also add Keys and Directories from the DB.

break;
}
}

for (OzoneFileStatus fileStatus : cacheDirMap.values()) {
if (countEntries >= numEntries) {
break;
}
fileStatusFinalList.add(fileStatus);
countEntries++;
}

if (omKeyArgs.getLatestVersionLocation()) {
Expand Down Expand Up @@ -1947,7 +1957,7 @@ protected int getDirectories(
iterator = dirTable.iterator();

iterator.seek(seekDirInDB);

countEntries = 0;
while (iterator.hasNext() && numEntries - countEntries > 0) {
Table.KeyValue<String, OmDirectoryInfo> entry = iterator.next();
OmDirectoryInfo dirInfo = entry.getValue();
Expand Down Expand Up @@ -1985,6 +1995,7 @@ private int getFilesFromDirectory(
iterator)
throws IOException {
iterator.seek(seekKeyInDB);
countEntries = 0;
while (iterator.hasNext() && numEntries - countEntries > 0) {
Table.KeyValue<String, OmKeyInfo> entry = iterator.next();
OmKeyInfo keyInfo = entry.getValue();
Expand Down