diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java index 1eadd7bd9c0..7f304810ffd 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java @@ -137,7 +137,6 @@ public void evictCache(List epochs) { } // As ConcurrentHashMap computeIfPresent is atomic, there is no race // condition between cache cleanup and requests updating same cache entry. - // Also, if higher epoch is present indicates all previous epoch is received if (epochs.contains(currentEpoch)) { for (Iterator> iterator = currentCacheKeys.iterator(); iterator.hasNext();) { @@ -148,7 +147,7 @@ public void evictCache(List epochs) { if (v.getEpoch() == currentEpoch) { if (LOG.isDebugEnabled()) { LOG.debug("CacheKey {} with epoch {} is removed from cache", - k.getCacheKey(), currentEpoch); + k.getCacheKey(), currentEpoch); } return null; } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java index fdb8ea968ea..4534f0b2101 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMRatisSnapshots.java @@ -388,6 +388,7 @@ private void checkSnapshot(OzoneManager leaderOM, OzoneManager followerOM, @Test @Timeout(300) + @Unhealthy("HDDS-11415 local passes but remote fails, follower on start unable to call get snapshot") public void testInstallIncrementalSnapshot(@TempDir Path tempDir) throws Exception { // Get the leader OM