From 4837a07b3ab15b403e292d83e647f883c0567019 Mon Sep 17 00:00:00 2001
From: Hemant Kumar <hemantadhvaniya@gmail.com>
Date: Fri, 22 Dec 2023 01:31:09 +0530
Subject: [PATCH] Log if there is a failure in closing RocksDB

---
 .../main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java   | 4 ++--
 .../org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
index 65e891f9820e..71cd3716e566 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
@@ -226,12 +226,12 @@ public void close() throws IOException {
     }
 
     RDBMetrics.unRegister();
-    IOUtils.closeQuietly(checkPointManager);
+    IOUtils.close(LOG, checkPointManager);
     if (rocksDBCheckpointDiffer != null) {
       RocksDBCheckpointDifferHolder
           .invalidateCacheEntry(rocksDBCheckpointDiffer.getMetadataDir());
     }
-    IOUtils.closeQuietly(db);
+    IOUtils.close(LOG, db);
   }
 
   @Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
index 97a7a0608d42..d8932c0e7e0a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
@@ -169,8 +169,8 @@ public ReferenceCounted<IOmMetadataReader, SnapshotCache> get(String key,
     // does not exist, and increment the reference count on the instance.
     ReferenceCounted<IOmMetadataReader, SnapshotCache> rcOmSnapshot =
         dbMap.compute(key, (k, v) -> {
-          LOG.info("Loading snapshot. Table key: {}", k);
           if (v == null) {
+            LOG.info("Loading snapshot. Table key: {}", k);
             try {
               v = new ReferenceCounted<>(cacheLoader.load(k), false, this);
             } catch (OMException omEx) {
@@ -317,7 +317,7 @@ private void cleanupInternal() {
       Preconditions.checkState(rcOmSnapshot == result,
           "Cache map entry removal failure. The cache is in an inconsistent "
               + "state. Expected OmSnapshot instance: " + rcOmSnapshot
-              + ", actual: " + result);
+              + ", actual: " + result + " for key: " + key);
 
       pendingEvictionList.remove(result);