You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by "devmadhuu (via GitHub)" <gi...@apache.org> on 2023/09/09 05:49:44 UTC
[GitHub] [ozone] devmadhuu commented on a diff in pull request #5244: HDDS-9233. listStatus() API is not correctly iterating cache.
devmadhuu commented on code in PR #5244:
URL: https://github.com/apache/ozone/pull/5244#discussion_r1320490252
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java:
##########
@@ -215,7 +215,11 @@ public Collection<OzoneFileStatus> listStatusFSO(OmKeyArgs args,
HeapEntry entry = heapIterator.next();
OzoneFileStatus status = entry.getStatus(prefixKey,
scmBlockSize, volumeName, bucketName, replication);
- map.putIfAbsent(entry.key, status);
+ // Since putIfAbsent doesn't work as expected in case of null value,
+ // so had to explicitly check using containsKey
Review Comment:
Ok sure. Done.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -1626,14 +1635,18 @@ private void findKeyInDbWithIterator(boolean recursive, String startKey,
.getImmediateChild(entryKeyName, keyName);
boolean isFile = OzoneFSUtils.isFile(immediateChild);
if (isFile) {
- if (!isKeyDeleted(entryInDb, keyTable)) {
+ // Since putIfAbsent doesn't work as expected in case of null
+ // value, so had to explicitly check using containsKey
+ if (!cacheKeyMap.containsKey(entryInDb)) {
cacheKeyMap.put(entryInDb,
new OzoneFileStatus(omKeyInfo, scmBlockSize, !isFile));
countEntries++;
}
} else {
// if entry is a directory
- if (!isKeyDeleted(entryInDb, keyTable)) {
+ // Since putIfAbsent doesn't work as expected in case of null
+ // value, so had to explicitly check using containsKey
Review Comment:
Yes. Removed.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -1626,14 +1635,18 @@ private void findKeyInDbWithIterator(boolean recursive, String startKey,
.getImmediateChild(entryKeyName, keyName);
boolean isFile = OzoneFSUtils.isFile(immediateChild);
if (isFile) {
- if (!isKeyDeleted(entryInDb, keyTable)) {
+ // Since putIfAbsent doesn't work as expected in case of null
+ // value, so had to explicitly check using containsKey
Review Comment:
Yes. Removed.
##########
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java:
##########
@@ -1611,9 +1619,10 @@ private void findKeyInDbWithIterator(boolean recursive, String startKey,
String entryKeyName = omKeyInfo.getKeyName();
if (recursive) {
// for recursive list all the entries
-
- if (!isKeyDeleted(entryInDb, keyTable)) {
- cacheKeyMap.putIfAbsent(entryInDb, new OzoneFileStatus(omKeyInfo,
+ // Since putIfAbsent doesn't work as expected in case of null value,
+ // so had to explicitly check using containsKey
Review Comment:
Yes. Removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@ozone.apache.org
For additional commands, e-mail: issues-help@ozone.apache.org