review fixes 3

Author: DEADripER

modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java

@@ -428,8 +428,12 @@ private static class GroupsConfigs {
         public final Map<Integer, String> grpIdToName;
 
         /** */
-        public GroupsConfigs(Map<Integer, List<String>> grpToNodes, Collection<StoredCacheData> cacheCfgs, Set<Integer> cacheIds,
-            Map<Integer, String> grpIdToName) {
+        public GroupsConfigs(
+            Map<Integer, List<String>> grpToNodes,
+            Collection<StoredCacheData> cacheCfgs,
+            Set<Integer> cacheIds,
+            Map<Integer, String> grpIdToName
+        ) {
             this.grpToNodes = grpToNodes;
             this.cacheCfgs = cacheCfgs;
             this.cacheIds = cacheIds;

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java

@@ -1221,73 +1221,92 @@ public void testReadEncrypted() throws Exception {
     }
 
     /** */
-    private void CheckDumpReaderDebugLogsGroupName(String[] grpNames) throws Exception {
-        String id = "test";
+    @Test
+    public void testDumpRateLimiter() throws Exception {
+        try (IgniteEx ign = startGrid(0)) {
+            ign.cluster().state(ClusterState.ACTIVE);
 
-        setLoggerDebugLevel();
+            byte[] val = new byte[(int)U.KB];
+            ThreadLocalRandom.current().nextBytes(val);
 
-        ListeningTestLogger testLog = new ListeningTestLogger(log);
+            int keysCnt = 10;
 
-        LogListener errLsnr = LogListener.matches("Error consuming partition").andMatches("grp=" + GRP).build();
-        LogListener cnsmLsnr = LogListener.matches("Consuming partition").andMatches("grp=" + GRP).build();
+            for (int i = 0; i < keysCnt; i++)
+                ign.getOrCreateCache(DEFAULT_CACHE_NAME).put(i, val);
 
-        testLog.registerListener(errLsnr);
-        testLog.registerListener(cnsmLsnr);
+            ign.context().distributedConfiguration()
+                .property(SNAPSHOT_TRANSFER_RATE_DMS_KEY)
+                .propagate(U.KB);
 
-        IgniteEx ign0 = startGrid(getConfiguration(id).setConsistentId(id).setGridLogger(testLog));
+            IgniteFuture<Void> fut = ign.snapshot().createDump(DMP_NAME, null);
 
-        ign0.cluster().state(ClusterState.ACTIVE);
+            IgniteSnapshotManager snpMgr = ign.context().cache().context().snapshotMgr();
 
-        IgniteCache<Integer, Integer> cache = ign0.createCache(new CacheConfiguration<Integer, Integer>()
-            .setName(CACHE_0)
-            .setGroupName(GRP)
-            .setBackups(1)
-            .setAffinity(new RendezvousAffinityFunction().setPartitions(3))
-        );
+            assertTrue(GridTestUtils.waitForCondition(() ->
+                snpMgr.currentSnapshotTask(CreateDumpFutureTask.class) != null, 10_000, 10));
 
-        IntStream.range(0, KEYS_CNT).forEach(i -> cache.put(i, i));
+            CreateDumpFutureTask task = snpMgr.currentSnapshotTask(CreateDumpFutureTask.class);
 
-        ign0.snapshot().createDump(DMP_NAME, null).get(getTestTimeout());
+            List<Long> processedVals = new ArrayList<>();
 
-        TestDumpConsumer cnsmr = new TestDumpConsumer() {
-            @Override public void onPartition(int grp, int part, Iterator<DumpEntry> data) {
-                throw new RuntimeException("trigger error log");
-            }
-        };
+            assertTrue(GridTestUtils.waitForCondition(() -> {
+                processedVals.add(task.processedSize());
 
-        assertThrows(null, () -> new DumpReader(
-                new DumpReaderConfiguration(
+                return fut.isDone();
+            }, getTestTimeout(), 100));
+
+            assertTrue("Expected distinct values: " + processedVals,
+                processedVals.stream().mapToLong(v -> v).distinct().count() >= keysCnt);
+
+            assertTrue("Expected sorted values: " + processedVals,
+                F.isSorted(processedVals.stream().mapToLong(v -> v).toArray()));
+        }
+    }
+
+    /** */
+    @Test
+    public void testConfigOnlySnapshotThrows() throws Exception {
+        try (IgniteEx ign = startGrid(0)) {
+            ign.cluster().state(ClusterState.ACTIVE);
+
+            IgniteCache<Integer, Integer> c = ign.createCache(DEFAULT_CACHE_NAME);
+
+            IntStream.range(0, 10).forEach(i -> c.put(i, i));
+
+            IgniteSnapshotManager snpMgr = ign.context().cache().context().snapshotMgr();
+
+            assertThrows(
+                null,
+                () -> {
+                    snpMgr.createSnapshot(
                         DMP_NAME,
                         null,
-                        ign0.configuration(),
-                        cnsmr,
-                        DFLT_THREAD_CNT,
-                        DFLT_TIMEOUT,
-                        true,
-                        true,
-                        false,
-                        grpNames,
                         null,
                         false,
-                        null
-                ),
-                testLog
-        ).run(), RuntimeException.class, "trigger error log");
-
-        assertTrue("Log with group name not found", errLsnr.check());
-        assertTrue("Consuming with group name not found", cnsmLsnr.check());
+                        false,
+                        false,
+                        false,
+                        false,
+                        false,
+                        true
+                    );
+                },
+                IgniteException.class,
+                "Config only supported only for dump"
+            );
+        }
     }
 
     /** */
     @Test
     public void testDumpReaderDebugLogsGroupName() throws Exception {
-        CheckDumpReaderDebugLogsGroupName(new String[]{GRP});
+        checkDumpReaderDebugLogsGroupName(new String[]{GRP});
     }
 
     /** */
     @Test
-    public void testDumpReaderDebugLogsGroupNameNull() throws Exception {
-        CheckDumpReaderDebugLogsGroupName(null);
+    public void testDumpReaderDebugLogsNullableGroupName() throws Exception {
+        checkDumpReaderDebugLogsGroupName(null);
     }
 
     /** */
@@ -1335,7 +1354,7 @@ public void testDumpReaderSkipCopiesLogsGroupName() throws Exception {
 
             node0.snapshot().createDump(dumpName0, null).get(getTestTimeout());
 
-            Thread.sleep(100);
+            U.sleep(100);
 
             node1.snapshot().createDump(dumpName1, null).get(getTestTimeout());
 
@@ -1400,80 +1419,61 @@ public void testDumpReaderSkipCopiesLogsGroupName() throws Exception {
     }
 
     /** */
-    @Test
-    public void testDumpRateLimiter() throws Exception {
-        try (IgniteEx ign = startGrid(0)) {
-            ign.cluster().state(ClusterState.ACTIVE);
-
-            byte[] val = new byte[(int)U.KB];
-            ThreadLocalRandom.current().nextBytes(val);
-
-            int keysCnt = 10;
-
-            for (int i = 0; i < keysCnt; i++)
-                ign.getOrCreateCache(DEFAULT_CACHE_NAME).put(i, val);
-
-            ign.context().distributedConfiguration()
-                .property(SNAPSHOT_TRANSFER_RATE_DMS_KEY)
-                .propagate(U.KB);
-
-            IgniteFuture<Void> fut = ign.snapshot().createDump(DMP_NAME, null);
-
-            IgniteSnapshotManager snpMgr = ign.context().cache().context().snapshotMgr();
-
-            assertTrue(GridTestUtils.waitForCondition(() ->
-                snpMgr.currentSnapshotTask(CreateDumpFutureTask.class) != null, 10_000, 10));
+    private void checkDumpReaderDebugLogsGroupName(String[] grpNames) throws Exception {
+        String id = "test";
 
-            CreateDumpFutureTask task = snpMgr.currentSnapshotTask(CreateDumpFutureTask.class);
+        setLoggerDebugLevel();
 
-            List<Long> processedVals = new ArrayList<>();
+        ListeningTestLogger testLog = new ListeningTestLogger(log);
 
-            assertTrue(GridTestUtils.waitForCondition(() -> {
-                processedVals.add(task.processedSize());
+        LogListener errLsnr = LogListener.matches("Error consuming partition").andMatches("grp=" + GRP).build();
+        LogListener cnsmLsnr = LogListener.matches("Consuming partition").andMatches("grp=" + GRP).build();
 
-                return fut.isDone();
-            }, getTestTimeout(), 100));
+        testLog.registerListener(errLsnr);
+        testLog.registerListener(cnsmLsnr);
 
-            assertTrue("Expected distinct values: " + processedVals,
-                processedVals.stream().mapToLong(v -> v).distinct().count() >= keysCnt);
+        IgniteEx ign = startGrid(getConfiguration(id).setConsistentId(id).setGridLogger(testLog));
 
-            assertTrue("Expected sorted values: " + processedVals,
-                F.isSorted(processedVals.stream().mapToLong(v -> v).toArray()));
-        }
-    }
+        ign.cluster().state(ClusterState.ACTIVE);
 
-    /** */
-    @Test
-    public void testConfigOnlySnapshotThrows() throws Exception {
-        try (IgniteEx ign = startGrid(0)) {
-            ign.cluster().state(ClusterState.ACTIVE);
+        IgniteCache<Integer, Integer> cache = ign.createCache(new CacheConfiguration<Integer, Integer>()
+            .setName(CACHE_0)
+            .setGroupName(GRP)
+            .setBackups(1)
+            .setAffinity(new RendezvousAffinityFunction().setPartitions(3))
+        );
 
-            IgniteCache<Integer, Integer> c = ign.createCache(DEFAULT_CACHE_NAME);
+        IntStream.range(0, KEYS_CNT).forEach(i -> cache.put(i, i));
 
-            IntStream.range(0, 10).forEach(i -> c.put(i, i));
+        ign.snapshot().createDump(DMP_NAME, null).get(getTestTimeout());
 
-            IgniteSnapshotManager snpMgr = ign.context().cache().context().snapshotMgr();
+        TestDumpConsumer cnsmr = new TestDumpConsumer() {
+            @Override public void onPartition(int grp, int part, Iterator<DumpEntry> data) {
+                throw new RuntimeException("trigger error log");
+            }
+        };
 
-            assertThrows(
+        assertThrows(null, () -> new DumpReader(
+            new DumpReaderConfiguration(
+                DMP_NAME,
                 null,
-                () -> {
-                    snpMgr.createSnapshot(
-                        DMP_NAME,
-                        null,
-                        null,
-                        false,
-                        false,
-                        false,
-                        false,
-                        false,
-                        false,
-                        true
-                    );
-                },
-                IgniteException.class,
-                "Config only supported only for dump"
-            );
-        }
+                ign.configuration(),
+                cnsmr,
+                DFLT_THREAD_CNT,
+                DFLT_TIMEOUT,
+                true,
+                true,
+                false,
+                grpNames,
+                null,
+                false,
+                null
+            ),
+            testLog
+        ).run(), RuntimeException.class, "trigger error log");
+
+        assertTrue("Log with group name not found", errLsnr.check());
+        assertTrue("Consuming with group name not found", cnsmLsnr.check());
     }
 
     /** */