IGNITE-27457 Implement result output for wal enable/disable control.sh commands #12608
Conversation
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
Member
|
Please, fix merge conflicts |
# Conflicts: # modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWalTest.java # modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java # modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalSetStateTask.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAdvancedSelfTest.java
timoninmaxim
requested changes
Jan 13, 2026
| */ | ||
| @Test | ||
| public void testWalChangeForMultiCacheGroup() throws Exception { | ||
| public void testWalManagementOperations() throws Exception { |
| * @throws Exception If failed. | ||
| */ | ||
| @Test | ||
| public void testWalChangeForNonPersistentCaches() throws Exception { |
Member
There was a problem hiding this comment.
Let's fix this behavior in different patch
| @Override protected Void run(@Nullable WalDisableCommandArg arg) throws IgniteException { | ||
| Set<String> grps = F.isEmpty(arg.groups()) ? null : new HashSet<>(Arrays.asList(arg.groups())); | ||
| @Override protected WalSetStateTaskResult run(@Nullable WalDisableCommandArg arg) throws IgniteException { | ||
| Set<String> requestedGrps = F.isEmpty(arg.groups()) ? null : new HashSet<>(Arrays.asList(arg.groups())); |
| } | ||
| } | ||
|
|
||
| for (String requestedGrp : requestedGrps) { |
Member
There was a problem hiding this comment.
Can reuse request groups after removing
| } | ||
| catch (Exception e) { | ||
| errors.add("Failed to execute operation - " + e.getMessage()); | ||
| return new WalSetStateTaskResult(successGrps, errors); |
| else { | ||
| WalSetStateTaskResult result = jobRes.getData(); | ||
| if (result.successGroups() != null) | ||
| successGrps.addAll(result.successGroups()); |
Member
There was a problem hiding this comment.
You can safely reuse success groups from any response
| if (errors.isEmpty()) | ||
| return new WalSetStateTaskResult(new ArrayList<>(successGrps)); | ||
| else | ||
| return new WalSetStateTaskResult(new ArrayList<>(successGrps), errors); |
Member
There was a problem hiding this comment.
make successGrps list in definition
| if (result.successGroups() != null) | ||
| successGrps.addAll(result.successGroups()); | ||
| if (!Boolean.TRUE.equals(result.success()) && result.errorMessages() != null) | ||
| errors.addAll(result.errorMessages()); |
Member
There was a problem hiding this comment.
There are duplicates of errors
| private static final long serialVersionUID = 0L; | ||
|
|
||
| /** Success flag. */ | ||
| private Boolean success; |
Member
There was a problem hiding this comment.
can check errors for empty.
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override public void printResult(WalDisableCommandArg arg, WalSetStateTaskResult res, Consumer<String> printer) { |
Member
There was a problem hiding this comment.
Let's move logic to a separate class
| Set<String> requestedGrps = F.isEmpty(arg.groups()) ? null : new HashSet<>(Arrays.asList(arg.groups())); | ||
| boolean isEnable = arg instanceof WalEnableCommandArg; | ||
| List<String> successGrps = new ArrayList<>(); | ||
| List<String> errors = new ArrayList<>(); |
| successGrps.add(grpName); | ||
| } | ||
| catch (Exception e) { | ||
| errors.add("Failed to " + (isEnable ? "enable" : "disable") + |
Member
There was a problem hiding this comment.
Send only exception messages
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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 TC.Bot: Check PR)Notes
If you need any help, please email [email protected] or ask anу advice on http://asf.slack.com #ignite channel.