IGNITE-20462 Fix idle_verify hash conflicts for expiring entries

apache · Sep 25, 2023 · 16f6cac · 16f6cac
1 parent b78d78c
commit 16f6cac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -2429,17 +2429,6 @@ public void testCacheIdleVerifyExpiringEntries() throws Exception {
         assertContains(log, testOut.toString(), "no conflicts have been found");
     }
 
-    /** */
-    private void assertDumpContains(String val) throws IOException {
-        Matcher fileNameMatcher = dumpFileNameMatcher();
-
-        assertTrue(fileNameMatcher.find());
-
-        String dumpContent = new String(Files.readAllBytes(Paths.get(fileNameMatcher.group(1))));
-
-        assertContains(log, dumpContent, val);
-    }
-
     /** */
     @Test
     public void testCacheSequence() throws Exception {

diff --git a/...gnite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java b/...gnite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -274,10 +274,7 @@ public SnapshotPartitionsVerifyHandler(GridCacheSharedContext<?, ?> cctx) {
 
                         assert hash != null : "OWNING must have hash: " + key;
 
-                        // If we skip hash calculation we don't iterate over all entries and can't calculate real
-                        // partition size (size can include entries to expire, which were already expired on other nodes
-                        // to the moment of snapshot creation), so we need to skip size comparison if there are entries
-                        // to expire exist.
+                        // We should skip size comparison if there are entries to expire exist.
                         if (hasExpiringEntries(snpCtx, pageStore, pageBuff, io.getPendingTreeRoot(pageAddr)))
                             hash.hasExpiringEntries(true);