Skip to content

HDDS-6238 Reduce memory requirements for list keys. #3032

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 1 commit into from
Feb 6, 2022
Merged

HDDS-6238 Reduce memory requirements for list keys. #3032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions ...p-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,6 @@ public List<OmKeyInfo> listKeys(String volumeName, String bucketName,


TreeMap<String, OmKeyInfo> cacheKeyMap = new TreeMap<>();
Set<String> deletedKeySet = new TreeSet<>();
Iterator<Map.Entry<CacheKey<String>, CacheValue<OmKeyInfo>>> iterator =
keyTable.cacheIterator();

Expand All @@ -911,12 +910,10 @@ public List<OmKeyInfo> listKeys(String volumeName, String bucketName,
OmKeyInfo omKeyInfo = entry.getValue().getCacheValue();
// Making sure that entry in cache is not for delete key request.

if (omKeyInfo != null) {
if (key.startsWith(seekPrefix) && key.compareTo(seekKey) >= 0) {
cacheKeyMap.put(key, omKeyInfo);
}
} else {
deletedKeySet.add(key);
if (omKeyInfo != null
&& key.startsWith(seekPrefix)
&& key.compareTo(seekKey) >= 0) {
cacheKeyMap.put(key, omKeyInfo);
}
}

Expand All @@ -934,7 +931,9 @@ public List<OmKeyInfo> listKeys(String volumeName, String bucketName,

// Entry should not be marked for delete, consider only those
// entries.
if(!deletedKeySet.contains(kv.getKey())) {
CacheValue<OmKeyInfo> cacheValue =
keyTable.getCacheValue(new CacheKey<>(kv.getKey()));
if(cacheValue == null || cacheValue.getCacheValue() != null) {
cacheKeyMap.put(kv.getKey(), kv.getValue());
currentCount++;
}
Expand Down Expand Up @@ -965,7 +964,6 @@ public List<OmKeyInfo> listKeys(String volumeName, String bucketName,

// Clear map and set.
cacheKeyMap.clear();
deletedKeySet.clear();

return result;
}
Expand Down