HDDS-10783. Close SstFileReaderIterator in RocksDBCheckpointDiffer (a…

…pache#6616) (cherry picked from commit a658802)
xichen01 · Jul 18, 2024 · 70fc5f7 · 70fc5f7
1 parent ae5daa8
commit 70fc5f7
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/...b-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java b/...b-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java
@@ -45,6 +45,8 @@
 import org.apache.hadoop.hdds.utils.db.managed.ManagedReadOptions;
 import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksIterator;
 import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksDB;
+import org.apache.hadoop.hdds.utils.db.managed.ManagedSstFileReader;
+import org.apache.hadoop.hdds.utils.db.managed.ManagedSstFileReaderIterator;
 import org.apache.ozone.compaction.log.CompactionFileInfo;
 import org.apache.ozone.compaction.log.CompactionLogEntry;
 import org.apache.ozone.rocksdb.util.RdbUtil;
@@ -59,7 +61,6 @@
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.SstFileReader;
-import org.rocksdb.SstFileReaderIterator;
 import org.rocksdb.TableProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -629,13 +630,12 @@ private long getSSTFileSummary(String filename)
       filename += SST_FILE_EXTENSION;
     }
 
-    try (
-        ManagedOptions option = new ManagedOptions();
-        SstFileReader reader = new SstFileReader(option)) {
+    try (ManagedOptions option = new ManagedOptions();
+         ManagedSstFileReader reader = ManagedSstFileReader.managed(new SstFileReader(option))) {
 
-      reader.open(getAbsoluteSstFilePath(filename));
+      reader.get().open(getAbsoluteSstFilePath(filename));
 
-      TableProperties properties = reader.getTableProperties();
+      TableProperties properties = reader.get().getTableProperties();
       if (LOG.isDebugEnabled()) {
         LOG.debug("{} has {} keys", filename, properties.getNumEntries());
       }
@@ -1575,18 +1575,19 @@ private CompactionFileInfo toFileInfo(String sstFile,
     CompactionFileInfo.Builder fileInfoBuilder =
         new CompactionFileInfo.Builder(fileName);
 
-    try (SstFileReader fileReader = new SstFileReader(options)) {
-      fileReader.open(sstFile);
-      String columnFamily = StringUtils.bytes2String(
-          fileReader.getTableProperties().getColumnFamilyName());
-      SstFileReaderIterator iterator = fileReader.newIterator(readOptions);
-      iterator.seekToFirst();
-      String startKey = StringUtils.bytes2String(iterator.key());
-      iterator.seekToLast();
-      String endKey = StringUtils.bytes2String(iterator.key());
-      fileInfoBuilder.setStartRange(startKey)
-          .setEndRange(endKey)
-          .setColumnFamily(columnFamily);
+    try (ManagedSstFileReader fileReader = ManagedSstFileReader.managed(new SstFileReader(options))) {
+      fileReader.get().open(sstFile);
+      String columnFamily = StringUtils.bytes2String(fileReader.get().getTableProperties().getColumnFamilyName());
+      try (ManagedSstFileReaderIterator iterator =
+               ManagedSstFileReaderIterator.managed(fileReader.get().newIterator(readOptions))) {
+        iterator.get().seekToFirst();
+        String startKey = StringUtils.bytes2String(iterator.get().key());
+        iterator.get().seekToLast();
+        String endKey = StringUtils.bytes2String(iterator.get().key());
+        fileInfoBuilder.setStartRange(startKey)
+            .setEndRange(endKey)
+            .setColumnFamily(columnFamily);
+      }
     } catch (RocksDBException rocksDBException) {
       // Ideally it should not happen. If it does just log the exception.
       // And let the compaction complete without the exception.