Handle redundancy in KeyManagerImpl#gatherSubDirsWithIterator().

Tejaskriya · Feb 3, 2025 · 392d7b4 · 392d7b4
1 parent f4bbd9d
commit 392d7b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -2081,21 +2081,17 @@ public List<OmKeyInfo> getPendingDeletionSubDirs(long volumeId, long bucketId,
     Table<String, OmDirectoryInfo> dirTable = metadataManager.getDirectoryTable();
     try (TableIterator<String,
         ? extends Table.KeyValue<String, OmDirectoryInfo>>
-        iterator = dirTable.iterator()) {
-      return gatherSubDirsWithIterator(parentInfo, numEntries,
-          seekDirInDB, countEntries, iterator);
+        iterator = dirTable.iterator(seekDirInDB)) {
+      return gatherSubDirsWithIterator(parentInfo, numEntries, countEntries, iterator);
     }
 
   }
 
   private List<OmKeyInfo> gatherSubDirsWithIterator(OmKeyInfo parentInfo,
-      long numEntries, String seekDirInDB,
-      long countEntries,
-      TableIterator<String,
-          ? extends Table.KeyValue<String, OmDirectoryInfo>> iterator)
+      long numEntries, long countEntries,
+      TableIterator<String, ? extends Table.KeyValue<String, OmDirectoryInfo>> iterator)
       throws IOException {
     List<OmKeyInfo> directories = new ArrayList<>();
-    iterator.seek(seekDirInDB);
 
     while (iterator.hasNext() && numEntries - countEntries > 0) {
       Table.KeyValue<String, OmDirectoryInfo> entry = iterator.next();

diff --git a/.../ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java b/.../ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequestUtils.java
@@ -75,7 +75,8 @@ public static boolean isSnapshotBucket(OMMetadataManager omMetadataManager,
   private static boolean checkInSnapshotDB(OMMetadataManager omMetadataManager,
       String dbSnapshotBucketKey) throws IOException {
     try (TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
-        iterator = omMetadataManager.getSnapshotInfoTable().iterator(dbSnapshotBucketKey)) {
+             iterator = omMetadataManager.getSnapshotInfoTable().iterator()) {
+      iterator.seek(dbSnapshotBucketKey);
       return iterator.hasNext() && iterator.next().getKey()
           .startsWith(dbSnapshotBucketKey);
     }

diff --git a/...anager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java b/...anager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketDeleteRequest.java
@@ -242,7 +242,8 @@ private boolean bucketContainsSnapshotInTable(
     try (
         TableIterator<String, ? extends Table.KeyValue<String, SnapshotInfo>>
             snapshotIterator = omMetadataManager
-            .getSnapshotInfoTable().iterator(snapshotBucketKey)) {
+            .getSnapshotInfoTable().iterator()) {
+      snapshotIterator.seek(snapshotBucketKey);
       if (snapshotIterator.hasNext()) {
         return snapshotIterator.next().getKey().startsWith(snapshotBucketKey);
       }