IGNITE-27716: Add group name to DumpReader logs#12840
Open
DEADripER wants to merge 3 commits intoapache:masterfrom
Open
IGNITE-27716: Add group name to DumpReader logs#12840DEADripER wants to merge 3 commits intoapache:masterfrom
DEADripER wants to merge 3 commits intoapache:masterfrom
Conversation
wernerdv
reviewed
Mar 4, 2026
| @@ -129,38 +131,40 @@ public DumpReader(DumpReaderConfiguration cfg, IgniteLogger log) { | |||
|
|
|||
| for (Map.Entry<Integer, List<String>> e : grpsCfgs.grpToNodes.entrySet()) { | |||
| int grp = e.getKey(); | |||
Contributor
There was a problem hiding this comment.
Maybe we should rename grp -> grpId - both here and in the log messages?
Contributor
There was a problem hiding this comment.
grp must be used for group name in logs.
wernerdv
reviewed
Mar 4, 2026
|
|
||
| grpsToNodes.get(grp).add(meta.folderName()); | ||
|
|
||
| if (!grpIdToName.containsKey(grp) && !grpCaches.isEmpty()) |
Contributor
There was a problem hiding this comment.
!grpCaches.isEmpty() - this is always true here.
There's a check above in the loop:
if (F.isEmpty(grpCaches))
continue;
wernerdv
reviewed
Mar 4, 2026
| assertTrue("Consuming with group name not found", cnsmLsnr.check()); | ||
| } | ||
| finally { | ||
| stopAllGrids(); |
Contributor
There was a problem hiding this comment.
stopAllGrids() is already called after the test completes in IgniteCacheDumpSelf2Test#afterTest, so it can be removed here.
wernerdv
reviewed
Mar 4, 2026
| } | ||
| }; | ||
|
|
||
| try { |
Contributor
There was a problem hiding this comment.
I suggest replacing it with:
assertThrows(null, () -> new DumpReader(
new DumpReaderConfiguration(
DMP_NAME,
null,
ign0.configuration(),
cnsmr,
DFLT_THREAD_CNT,
DFLT_TIMEOUT,
true,
true,
false,
new String[]{GRP},
null,
false,
null
),
testLog
).run(), RuntimeException.class, "trigger error log");
wernerdv
reviewed
Mar 4, 2026
Comment on lines
+1226
to
+1237
| String id = "test"; | ||
| setLoggerDebugLevel(); | ||
| ListeningTestLogger testLog = new ListeningTestLogger(log); | ||
|
|
||
| LogListener errLsnr = LogListener.matches("Error consuming partition") | ||
| .andMatches("grpName=" + GRP) | ||
| .build(); | ||
| LogListener cnsmLsnr = LogListener.matches("Consuming partition") | ||
| .andMatches("grpName=" + GRP) | ||
| .build(); | ||
| testLog.registerListener(errLsnr); | ||
| testLog.registerListener(cnsmLsnr); |
Contributor
There was a problem hiding this comment.
Suggested change
| String id = "test"; | |
| setLoggerDebugLevel(); | |
| ListeningTestLogger testLog = new ListeningTestLogger(log); | |
| LogListener errLsnr = LogListener.matches("Error consuming partition") | |
| .andMatches("grpName=" + GRP) | |
| .build(); | |
| LogListener cnsmLsnr = LogListener.matches("Consuming partition") | |
| .andMatches("grpName=" + GRP) | |
| .build(); | |
| testLog.registerListener(errLsnr); | |
| testLog.registerListener(cnsmLsnr); | |
| String id = "test"; | |
| setLoggerDebugLevel(); | |
| ListeningTestLogger testLog = new ListeningTestLogger(log); | |
| LogListener errLsnr = LogListener.matches("Error consuming partition").andMatches("grpName=" + GRP).build(); | |
| LogListener cnsmLsnr = LogListener.matches("Consuming partition").andMatches("grpName=" + GRP).build(); | |
| testLog.registerListener(errLsnr); | |
| testLog.registerListener(cnsmLsnr); |
wernerdv
reviewed
Mar 4, 2026
Comment on lines
+1240
to
+1242
| IgniteEx ign0 = startGrid(getConfiguration(id) | ||
| .setConsistentId(id) | ||
| .setGridLogger(testLog)); |
Contributor
There was a problem hiding this comment.
Suggested change
| IgniteEx ign0 = startGrid(getConfiguration(id) | |
| .setConsistentId(id) | |
| .setGridLogger(testLog)); | |
| IgniteEx ign = startGrid(getConfiguration(id).setConsistentId(id).setGridLogger(testLog)); |
wernerdv
reviewed
Mar 4, 2026
| .setGridLogger(testLog)); | ||
|
|
||
| node0.cluster().state(ClusterState.ACTIVE); | ||
| node1.cluster().state(ClusterState.ACTIVE); |
Contributor
There was a problem hiding this comment.
The cluster is already active, remove this line.
wernerdv
reviewed
Mar 4, 2026
| .times(parts) | ||
| .andMatches("grpName=" + GRP) | ||
| .build(); | ||
| testLog.registerListener(skipLsnr); |
wernerdv
reviewed
Mar 4, 2026
|
|
||
| node0.snapshot().createDump(dumpName0, null).get(getTestTimeout()); | ||
|
|
||
| Thread.sleep(100); |
Contributor
There was a problem hiding this comment.
Suggested change
| Thread.sleep(100); | |
| U.sleep(100); |
wernerdv
reviewed
Mar 4, 2026
| assertTrue(skipLsnr.check()); | ||
| } | ||
| finally { | ||
| stopAllGrids(); |
wernerdv
reviewed
Mar 4, 2026
| } | ||
|
|
||
| @Override public void onPartition(int grpId, int partId, Iterator<DumpEntry> data) { | ||
| while (data.hasNext()) |
Contributor
There was a problem hiding this comment.
The test passes locally without this code.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Thank you for submitting the pull request to the Apache Ignite.
In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:
The Contribution Checklist
The description explains WHAT and WHY was made instead of HOW.
The following pattern must be used:
IGNITE-XXXX Change summarywhereXXXX- number of JIRA issue.(see the Maintainers list)
the
green visaattached to the JIRA ticket (see tabPR Checkat TC.Bot - Instance 1 or TC.Bot - Instance 2)Notes
If you need any help, please email dev@ignite.apache.org or ask anу advice on http://asf.slack.com #ignite channel.