-
Notifications
You must be signed in to change notification settings - Fork 1.9k
IGNITE-27457 Implement result output for wal enable/disable control.sh commands #12608
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
VolkodamovDaniil
wants to merge
12
commits into
apache:master
Choose a base branch
from
VolkodamovDaniil:ignite-27457
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
67c28e9
change wal mode for multiple caches from same group
VolkodamovDaniil e3082eb
replace try-catch with assertThrows
VolkodamovDaniil bcd2fc6
extend validation
VolkodamovDaniil dd502d4
add test that reveals problem
VolkodamovDaniil 9f73e77
support cache groups in change WAL methods
VolkodamovDaniil 3b993fd
add result reporting to WAL management commands
VolkodamovDaniil ca9aa86
Merge remote-tracking branch 'upstream/master' into ignite-27457
VolkodamovDaniil b6c94a8
remove extra newline
VolkodamovDaniil dc2abe8
update tests to verify commands output
VolkodamovDaniil d0778e7
add test for non persistent caches
VolkodamovDaniil 4c3feea
use VisorOneNodeTask for WalSetStateTask
VolkodamovDaniil 4778664
move result printing to shared utility
VolkodamovDaniil File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
55 changes: 55 additions & 0 deletions
55
...re/src/main/java/org/apache/ignite/internal/management/wal/WalSetStateResultReporter.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.ignite.internal.management.wal; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.function.Consumer; | ||
|
|
||
| /** */ | ||
| public class WalSetStateResultReporter { | ||
| /** | ||
| * Print WAL disable/enable command result. | ||
| * | ||
| * @param arg Command argument. | ||
| * @param res Command result. | ||
| * @param printer Output consumer. | ||
| */ | ||
| public static void printResult(WalStateCommandArg arg, WalSetStateTaskResult res, Consumer<String> printer) { | ||
| String operation = arg instanceof WalEnableCommand.WalEnableCommandArg ? "enable" : "disable"; | ||
| List<String> successGrps = res.successGroups(); | ||
| Map<String, String> errors = res.errorsByGroup(); | ||
|
|
||
| if (!successGrps.isEmpty()) { | ||
| printer.accept("Successfully " + operation + "d WAL for groups:"); | ||
| for (String grp : successGrps) | ||
| printer.accept(" " + grp); | ||
| } | ||
|
|
||
| if (errors != null && !errors.isEmpty()) { | ||
| printer.accept("Failed to " + operation + " WAL for groups:"); | ||
| for (Map.Entry<String, String> entry : errors.entrySet()) | ||
| printer.accept(" " + entry.getKey() + " - " + entry.getValue()); | ||
| } | ||
| } | ||
|
|
||
| /** Default constructor. */ | ||
| private WalSetStateResultReporter() { | ||
| // No-op. | ||
| } | ||
| } |
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
85 changes: 85 additions & 0 deletions
85
...s/core/src/main/java/org/apache/ignite/internal/management/wal/WalSetStateTaskResult.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.ignite.internal.management.wal; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.ObjectInput; | ||
| import java.io.ObjectOutput; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.ignite.internal.dto.IgniteDataTransferObject; | ||
| import org.apache.ignite.internal.util.typedef.internal.U; | ||
|
|
||
| /** | ||
| * Result of WAL enable/disable operation. | ||
| */ | ||
| public class WalSetStateTaskResult extends IgniteDataTransferObject { | ||
| /** */ | ||
| private static final long serialVersionUID = 0L; | ||
|
|
||
| /** Successfully processed groups. */ | ||
| private List<String> successGrps; | ||
|
|
||
| /** Errors by group name. */ | ||
| private Map<String, String> errorsByGrp; | ||
|
|
||
| /** Default constructor. */ | ||
| public WalSetStateTaskResult() { | ||
| // No-op. | ||
| } | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param successGrps Successfully processed groups. | ||
| * @param errorsByGrp Error messages. | ||
| */ | ||
| public WalSetStateTaskResult(List<String> successGrps, Map<String, String> errorsByGrp) { | ||
| this.successGrps = new ArrayList<>(successGrps); | ||
| this.errorsByGrp = new HashMap<>(errorsByGrp); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override protected void writeExternalData(ObjectOutput out) throws IOException { | ||
| U.writeCollection(out, successGrps); | ||
| U.writeMap(out, errorsByGrp); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { | ||
| successGrps = U.readList(in); | ||
| errorsByGrp = U.readMap(in); | ||
| } | ||
|
|
||
| /** | ||
| * @return Successfully processed groups. | ||
| */ | ||
| public List<String> successGroups() { | ||
| return Collections.unmodifiableList(successGrps); | ||
| } | ||
|
|
||
| /** | ||
| * @return Error messages by group name if operation failed. | ||
| */ | ||
| public Map<String, String> errorsByGroup() { | ||
| return Collections.unmodifiableMap(errorsByGrp); | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's move logic to a separate class