wip

apache · Jun 29, 2023 · 98ce845 · 98ce845
1 parent e6672ed
commit 98ce845
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java
@@ -326,30 +326,30 @@ private void checkLinks(IgniteEx srv, List<Long> expLinks) {
 
     /** Archive given segments links with possible gaps. */
     private void archiveSegmentLinks(List<Long> idxs) throws Exception {
-        for (long idx = 0; idx <= idxs.stream().mapToLong(v -> v).max().getAsLong(); idx++)
-            archiveSegment(idx, !idxs.contains(idx));
-    }
+        for (long idx = 0; idx <= idxs.stream().mapToLong(v -> v).max().getAsLong(); idx++) {
+            boolean skipCdcSegment = !idxs.contains(idx);
 
-    /** */
-    private void archiveSegment(long expIdx, boolean skipCdcSegment) throws Exception {
-        addData(srv1.cache(DEFAULT_CACHE_NAME), 0, KEYS_CNT);
+            addData(srv1.cache(DEFAULT_CACHE_NAME), 0, KEYS_CNT);
 
-        cdcDisabled.propagate(skipCdcSegment);
+            cdcDisabled.propagate(skipCdcSegment);
 
-        CountDownLatch latch = new CountDownLatch(G.allGrids().size());
+            CountDownLatch latch = new CountDownLatch(G.allGrids().size());
 
-        for (Ignite srv : G.allGrids()) {
-            srv.events().localListen(evt -> {
-                if (expIdx == ((WalSegmentArchivedEvent)evt).getAbsWalSegmentIdx())
-                    latch.countDown();
+            for (Ignite srv : G.allGrids()) {
+                long idx0 = idx;
 
-                return true;
-            }, EVT_WAL_SEGMENT_ARCHIVED);
-        }
+                srv.events().localListen(evt -> {
+                    if (idx0 == ((WalSegmentArchivedEvent)evt).getAbsWalSegmentIdx())
+                        latch.countDown();
 
-        latch.await(2 * WAL_ARCHIVE_TIMEOUT, TimeUnit.MILLISECONDS);
+                    return true;
+                }, EVT_WAL_SEGMENT_ARCHIVED);
+            }
 
-        cdcDisabled.propagate(false);
+            latch.await(2 * WAL_ARCHIVE_TIMEOUT, TimeUnit.MILLISECONDS);
+
+            cdcDisabled.propagate(false);
+        }
     }
 
     /** */