fix compilation error

ceekay47 · Feb 28, 2024 · 6585630 · 6585630
1 parent 05b4c2b
commit 6585630
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmSnapshotManager.java
@@ -23,6 +23,7 @@
 import com.google.common.cache.CacheLoader;
 import java.io.File;
 import java.io.IOException;
+import java.lang.ref.Reference;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -418,6 +419,7 @@ public int getSnapshotCacheSize() {
   public void invalidateCache() {
     if (snapshotCache != null) {
       snapshotCache.invalidateAll();
+      updateSnapshotCacheSizeMetric();
     }
   }
 
@@ -429,6 +431,7 @@ public void invalidateCache() {
   public void invalidateCacheEntry(UUID key) throws IOException {
     if (snapshotCache != null) {
       snapshotCache.invalidate(key);
+      updateSnapshotCacheSizeMetric();
     }
   }
 
@@ -679,7 +682,9 @@ private ReferenceCounted<OmSnapshot> getSnapshot(String snapshotTableKey, boolea
     }
 
     // retrieve the snapshot from the cache
-    return snapshotCache.get(snapshotInfo.getSnapshotId());
+    ReferenceCounted<OmSnapshot> snapshot = snapshotCache.get(snapshotInfo.getSnapshotId());
+    updateSnapshotCacheSizeMetric();
+    return snapshot;
   }
 
   /**
@@ -980,9 +985,8 @@ public long getDiffCleanupServiceInterval() {
 
   /**
    * Updates the SnapshotCache size jmx metric.
-   * @param cacheSize SnapshotCache size
    */
-  public void updateSnapshotCacheSizeMetric(int cacheSize) {
-    this.ozoneManager.getMetrics().setNumSnapshotCacheSize(cacheSize);
+  public void updateSnapshotCacheSizeMetric() {
+    this.ozoneManager.getMetrics().setNumSnapshotCacheSize(getSnapshotCacheSize());
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -856,7 +856,7 @@ private void instantiateServices(boolean withNewSnapshot) throws IOException {
     omSnapshotManager = new OmSnapshotManager(this);
 
     // Snapshot metrics
-    metrics.setNumSnapshotCacheSize(omSnapshotManager.getSnapshotCache().size());
+    metrics.setNumSnapshotCacheSize(omSnapshotManager.getSnapshotCacheSize());
     updateActiveSnapshotMetrics();
 
     if (withNewSnapshot) {

diff --git a/...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java b/...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
@@ -86,7 +86,6 @@ public void invalidate(UUID key) throws IOException {
       }
       return null;
     });
-    this.omSnapshotManager.updateSnapshotCacheSizeMetric(size());
   }
 
   /**
@@ -106,7 +105,6 @@ public void invalidateAll() {
       }
       it.remove();
     }
-    this.omSnapshotManager.updateSnapshotCacheSizeMetric(size());
   }
 
   /**
@@ -159,7 +157,6 @@ public ReferenceCounted<OmSnapshot> get(UUID key) throws IOException {
           }
           return v;
         });
-    this.omSnapshotManager.updateSnapshotCacheSizeMetric(size());
     if (rcOmSnapshot == null) {
       // The only exception that would fall through the loader logic above
       // is OMException with FILE_NOT_FOUND.
@@ -232,7 +229,6 @@ private void cleanupInternal() {
           return null;
         }
       });
-      this.omSnapshotManager.updateSnapshotCacheSizeMetric(size());
     }
   }
 }