Skip to content

HDDS-13159. Refactor KeyManagerImpl for getting deleted subdirectories and deleted subFiles #8538

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
swamirishi merged 2 commits into from
Jun 3, 2025
+67 −98
Merged

HDDS-13159. Refactor KeyManagerImpl for getting deleted subdirectories and deleted subFiles #8538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae21878
HDDS-13159. Refactor KeyManagerImpl for getting deleted subdirectorie…
swamirishi May 31, 2025
cd0157b
HDDS-13159. Static Import KeyValue
swamirishi May 31, 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
149 changes: 51 additions & 98 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 @@ -131,6 +131,7 @@
import org.apache.hadoop.hdds.utils.BackgroundService;
import org.apache.hadoop.hdds.utils.db.StringCodec;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.Table.KeyValue;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
Expand Down Expand Up @@ -160,6 +161,7 @@
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.WithParentObjectId;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
Expand Down Expand Up @@ -734,21 +736,21 @@ public ListKeysResult listKeys(String volumeName, String bucketName,

@Override
public PendingKeysDeletion getPendingDeletionKeys(
final CheckedFunction<Table.KeyValue<String, OmKeyInfo>, Boolean, IOException> filter, final int count)
final CheckedFunction<KeyValue<String, OmKeyInfo>, Boolean, IOException> filter, final int count)
throws IOException {
return getPendingDeletionKeys(null, null, null, filter, count);
}

@Override
public PendingKeysDeletion getPendingDeletionKeys(
String volume, String bucket, String startKey,
CheckedFunction<Table.KeyValue<String, OmKeyInfo>, Boolean, IOException> filter,
CheckedFunction<KeyValue<String, OmKeyInfo>, Boolean, IOException> filter,
int count) throws IOException {
List<BlockGroup> keyBlocksList = Lists.newArrayList();
Map<String, RepeatedOmKeyInfo> keysToModify = new HashMap<>();
// Bucket prefix would be empty if volume is empty i.e. either null or "".
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket, false);
try (TableIterator<String, ? extends Table.KeyValue<String, RepeatedOmKeyInfo>>
try (TableIterator<String, ? extends KeyValue<String, RepeatedOmKeyInfo>>
delKeyIter = metadataManager.getDeletedTable().iterator(bucketPrefix.orElse(""))) {

/* Seeking to the start key if it not null. The next key picked up would be ensured to start with the bucket
Expand All @@ -760,7 +762,7 @@ public PendingKeysDeletion getPendingDeletionKeys(
int currentCount = 0;
while (delKeyIter.hasNext() && currentCount < count) {
RepeatedOmKeyInfo notReclaimableKeyInfo = new RepeatedOmKeyInfo();
Table.KeyValue<String, RepeatedOmKeyInfo> kv = delKeyIter.next();
KeyValue<String, RepeatedOmKeyInfo> kv = delKeyIter.next();
if (kv != null) {
List<BlockGroup> blockGroupList = Lists.newArrayList();
// Multiple keys with the same path can be queued in one DB entry
Expand Down Expand Up @@ -795,12 +797,12 @@ public PendingKeysDeletion getPendingDeletionKeys(
return new PendingKeysDeletion(keyBlocksList, keysToModify);
}

private <V, R> List<Table.KeyValue<String, R>> getTableEntries(String startKey,
TableIterator<String, ? extends Table.KeyValue<String, V>> tableIterator,
private <V, R> List<KeyValue<String, R>> getTableEntries(String startKey,
TableIterator<String, ? extends KeyValue<String, V>> tableIterator,
Function<V, R> valueFunction,
CheckedFunction<Table.KeyValue<String, V>, Boolean, IOException> filter,
CheckedFunction<KeyValue<String, V>, Boolean, IOException> filter,
int size) throws IOException {
List<Table.KeyValue<String, R>> entries = new ArrayList<>();
List<KeyValue<String, R>> entries = new ArrayList<>();
/* Seek to the start key if it's not null. The next key in queue is ensured to start with the bucket
prefix, {@link org.apache.hadoop.hdds.utils.db.Table#iterator(bucketPrefix)} would ensure this.
*/
Expand All @@ -811,7 +813,7 @@ private <V, R> List<Table.KeyValue<String, R>> getTableEntries(String startKey,
}
int currentCount = 0;
while (tableIterator.hasNext() && currentCount < size) {
Table.KeyValue<String, V> kv = tableIterator.next();
KeyValue<String, V> kv = tableIterator.next();
if (kv != null && filter.apply(kv)) {
entries.add(Table.newKeyValue(kv.getKey(), valueFunction.apply(kv.getValue())));
currentCount++;
Expand All @@ -833,11 +835,11 @@ private Optional<String> getBucketPrefix(String volumeName, String bucketName, b
}

@Override
public List<Table.KeyValue<String, String>> getRenamesKeyEntries(
public List<KeyValue<String, String>> getRenamesKeyEntries(
String volume, String bucket, String startKey,
CheckedFunction<Table.KeyValue<String, String>, Boolean, IOException> filter, int size) throws IOException {
CheckedFunction<KeyValue<String, String>, Boolean, IOException> filter, int size) throws IOException {
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket, false);
try (TableIterator<String, ? extends Table.KeyValue<String, String>>
try (TableIterator<String, ? extends KeyValue<String, String>>
renamedKeyIter = metadataManager.getSnapshotRenamedTable().iterator(bucketPrefix.orElse(""))) {
return getTableEntries(startKey, renamedKeyIter, Function.identity(), filter, size);
}
Expand Down Expand Up @@ -882,12 +884,12 @@ private <T> CheckedFunction<KeyManager, T, IOException> getPreviousSnapshotOzone
}

@Override
public List<Table.KeyValue<String, List<OmKeyInfo>>> getDeletedKeyEntries(
public List<KeyValue<String, List<OmKeyInfo>>> getDeletedKeyEntries(
String volume, String bucket, String startKey,
CheckedFunction<Table.KeyValue<String, RepeatedOmKeyInfo>, Boolean, IOException> filter,
CheckedFunction<KeyValue<String, RepeatedOmKeyInfo>, Boolean, IOException> filter,
int size) throws IOException {
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket, false);
try (TableIterator<String, ? extends Table.KeyValue<String, RepeatedOmKeyInfo>>
try (TableIterator<String, ? extends KeyValue<String, RepeatedOmKeyInfo>>
delKeyIter = metadataManager.getDeletedTable().iterator(bucketPrefix.orElse(""))) {
return getTableEntries(startKey, delKeyIter, RepeatedOmKeyInfo::cloneOmKeyInfoList, filter, size);
}
Expand Down Expand Up @@ -1537,10 +1539,10 @@ private OmKeyInfo createFakeDirIfShould(String volume, String bucket,
}
}

try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
keyTblItr = keyTable.iterator(targetKey)) {
while (keyTblItr.hasNext()) {
Table.KeyValue<String, OmKeyInfo> keyValue = keyTblItr.next();
KeyValue<String, OmKeyInfo> keyValue = keyTblItr.next();
if (keyValue != null) {
String key = keyValue.getKey();
// HDDS-7871: RocksIterator#seek() may position at the key
Expand Down Expand Up @@ -1851,7 +1853,7 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
String keyArgs = OzoneFSUtils.addTrailingSlashIfNeeded(
metadataManager.getOzoneKey(volumeName, bucketName, keyName));

TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>> iterator;
TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> iterator;
Table<String, OmKeyInfo> keyTable;
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
Expand Down Expand Up @@ -1908,12 +1910,12 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
return fileStatusList;
}

private TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
private TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
getIteratorForKeyInTableCache(
boolean recursive, String startKey, String volumeName, String bucketName,
TreeMap<String, OzoneFileStatus> cacheKeyMap, String keyArgs,
Table<String, OmKeyInfo> keyTable) throws IOException {
TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>> iterator;
TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> iterator;
Iterator<Map.Entry<CacheKey<String>, CacheValue<OmKeyInfo>>>
cacheIter = keyTable.cacheIterator();
String startCacheKey = metadataManager.getOzoneKey(volumeName, bucketName, startKey);
Expand All @@ -1931,12 +1933,12 @@ private void findKeyInDbWithIterator(boolean recursive, String startKey,
TreeMap<String, OzoneFileStatus> cacheKeyMap, String keyArgs,
Table<String, OmKeyInfo> keyTable,
TableIterator<String,
? extends Table.KeyValue<String, OmKeyInfo>> iterator)
? extends KeyValue<String, OmKeyInfo>> iterator)
throws IOException {
// Then, find key in DB
String seekKeyInDb =
metadataManager.getOzoneKey(volumeName, bucketName, startKey);
Table.KeyValue<String, OmKeyInfo> entry = iterator.seek(seekKeyInDb);
KeyValue<String, OmKeyInfo> entry = iterator.seek(seekKeyInDb);
int countEntries = 0;
if (iterator.hasNext()) {
if (entry.getKey().equals(keyArgs)) {
Expand Down Expand Up @@ -2187,7 +2189,7 @@ private void slimLocationVersion(OmKeyInfo... keyInfos) {
}

@Override
public TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>> getDeletedDirEntries(
public TableIterator<String, ? extends KeyValue<String, OmKeyInfo>> getDeletedDirEntries(
String volume, String bucket) throws IOException {
Optional<String> bucketPrefix = getBucketPrefix(volume, bucket, true);
return metadataManager.getDeletedDirTable().iterator(bucketPrefix.orElse(""));
Expand All @@ -2196,101 +2198,52 @@ private void slimLocationVersion(OmKeyInfo... keyInfos) {
@Override
public DeleteKeysResult getPendingDeletionSubDirs(long volumeId, long bucketId,
OmKeyInfo parentInfo, long remainingBufLimit) throws IOException {
String seekDirInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
long countEntries = 0;

Table<String, OmDirectoryInfo> dirTable = metadataManager.getDirectoryTable();
try (TableIterator<String,
? extends Table.KeyValue<String, OmDirectoryInfo>>
iterator = dirTable.iterator(seekDirInDB)) {
return gatherSubDirsWithIterator(parentInfo, countEntries, iterator, remainingBufLimit);
}

return gatherSubPathsWithIterator(volumeId, bucketId, parentInfo, metadataManager.getDirectoryTable(),
omDirectoryInfo -> OMFileRequest.getKeyInfoWithFullPath(parentInfo, omDirectoryInfo), remainingBufLimit);
}

private DeleteKeysResult gatherSubDirsWithIterator(OmKeyInfo parentInfo,
long countEntries,
TableIterator<String,
? extends Table.KeyValue<String, OmDirectoryInfo>> iterator, long remainingBufLimit)
throws IOException {
List<OmKeyInfo> directories = new ArrayList<>();
long consumedSize = 0;
boolean processedSubDirs = false;

while (iterator.hasNext() && remainingBufLimit > 0) {
Table.KeyValue<String, OmDirectoryInfo> entry = iterator.next();
OmDirectoryInfo dirInfo = entry.getValue();
long objectSerializedSize = entry.getRawSize();
if (!OMFileRequest.isImmediateChild(dirInfo.getParentObjectID(),
parentInfo.getObjectID())) {
processedSubDirs = true;
break;
}
if (!metadataManager.getDirectoryTable().isExist(entry.getKey())) {
continue;
}
if (remainingBufLimit - objectSerializedSize < 0) {
break;
}
String dirName = OMFileRequest.getAbsolutePath(parentInfo.getKeyName(),
dirInfo.getName());
OmKeyInfo omKeyInfo = OMFileRequest.getOmKeyInfo(
parentInfo.getVolumeName(), parentInfo.getBucketName(), dirInfo,
dirName);
directories.add(omKeyInfo);
countEntries++;
remainingBufLimit -= objectSerializedSize;
consumedSize += objectSerializedSize;
}

processedSubDirs = processedSubDirs || (!iterator.hasNext());

return new DeleteKeysResult(directories, consumedSize, processedSubDirs);
}

@Override
public DeleteKeysResult getPendingDeletionSubFiles(long volumeId,
long bucketId, OmKeyInfo parentInfo, long remainingBufLimit)
throws IOException {
List<OmKeyInfo> files = new ArrayList<>();
private <T extends WithParentObjectId> DeleteKeysResult gatherSubPathsWithIterator(
long volumeId, long bucketId, OmKeyInfo parentInfo,
Table<String, T> table, Function<T, OmKeyInfo> deleteKeyTransformer,
long remainingBufLimit) throws IOException {
List<OmKeyInfo> keyInfos = new ArrayList<>();
String seekFileInDB = metadataManager.getOzonePathKey(volumeId, bucketId,
parentInfo.getObjectID(), "");
long consumedSize = 0;
boolean processedSubFiles = false;

Table fileTable = metadataManager.getFileTable();
try (TableIterator<String, ? extends Table.KeyValue<String, OmKeyInfo>>
iterator = fileTable.iterator(seekFileInDB)) {

boolean processedSubPaths = false;
try (TableIterator<String, ? extends KeyValue<String, T>> iterator = table.iterator(seekFileInDB)) {
while (iterator.hasNext() && remainingBufLimit > 0) {
Table.KeyValue<String, OmKeyInfo> entry = iterator.next();
OmKeyInfo fileInfo = entry.getValue();
KeyValue<String, T> entry = iterator.next();
T withParentObjectId = entry.getValue();
long objectSerializedSize = entry.getRawSize();
if (!OMFileRequest.isImmediateChild(fileInfo.getParentObjectID(),
if (!OMFileRequest.isImmediateChild(withParentObjectId.getParentObjectID(),
parentInfo.getObjectID())) {
processedSubFiles = true;
processedSubPaths = true;
break;
}
if (!metadataManager.getFileTable().isExist(entry.getKey())) {
if (!table.isExist(entry.getKey())) {
continue;
}
if (remainingBufLimit - objectSerializedSize < 0) {
break;
}
fileInfo.setFileName(fileInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(
parentInfo.getKeyName(), fileInfo.getKeyName());
fileInfo.setKeyName(fullKeyPath);

files.add(fileInfo);
OmKeyInfo keyInfo = deleteKeyTransformer.apply(withParentObjectId);
keyInfos.add(keyInfo);
remainingBufLimit -= objectSerializedSize;
consumedSize += objectSerializedSize;
}
processedSubFiles = processedSubFiles || (!iterator.hasNext());
processedSubPaths = processedSubPaths || (!iterator.hasNext());
return new DeleteKeysResult(keyInfos, consumedSize, processedSubPaths);
}
}

return new DeleteKeysResult(files, consumedSize, processedSubFiles);
@Override
public DeleteKeysResult getPendingDeletionSubFiles(long volumeId,
long bucketId, OmKeyInfo parentInfo, long remainingBufLimit)
throws IOException {
return gatherSubPathsWithIterator(volumeId, bucketId, parentInfo, metadataManager.getFileTable(),
keyInfo -> OMFileRequest.getKeyInfoWithFullPath(parentInfo, keyInfo),
remainingBufLimit);
}

public boolean isBucketFSOptimized(String volName, String buckName)
Expand Down
16 changes: 16 additions & 0 deletions ...ne/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,22 @@ public static OzoneFileStatus getOMKeyInfoIfExists(
return null;
}

public static OmKeyInfo getKeyInfoWithFullPath(OmKeyInfo parentInfo, OmDirectoryInfo directoryInfo) {
String dirName = OMFileRequest.getAbsolutePath(parentInfo.getKeyName(),
directoryInfo.getName());
return OMFileRequest.getOmKeyInfo(
parentInfo.getVolumeName(), parentInfo.getBucketName(), directoryInfo,
dirName);
}

public static OmKeyInfo getKeyInfoWithFullPath(OmKeyInfo parentInfo, OmKeyInfo omKeyInfo) {
omKeyInfo.setFileName(omKeyInfo.getKeyName());
String fullKeyPath = OMFileRequest.getAbsolutePath(
parentInfo.getKeyName(), omKeyInfo.getKeyName());
omKeyInfo.setKeyName(fullKeyPath);
return omKeyInfo;
}

/**
* Prepare OmKeyInfo from OmDirectoryInfo.
*
Expand Down