chaosctl add recover subcommand #3056

Hexilee · 2022-03-24T07:12:00Z

What problem does this PR solve?

Add recover subcommand for chaosctl. This is a part split from #2992.

What's changed and how it works?

Related changes

Need to update chaos-mesh/website
Need to update Dashboard UI
Need to cheery-pick to release branches
- release-2.1
- release-2.0

Checklist

Tests

Unit test
E2E test
No code
Manual test (add steps below)

Side effects

Breaking backward compatibility

Release note

Please add a release note.

You can safely ignore this section if you don't think this PR needs a release note.

DCO

If you find the DCO check fails, please run commands like below (Depends on the actual situations. For example, if the failed commit isn't the most recent) to fix it:

git commit --amend --signoff
git push --force

Signed-off-by: xixi <i@hexilee.me>

ti-chi-bot · 2022-03-24T07:12:01Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

WangXiangUSTC
cwen0

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

Signed-off-by: xixi <i@hexilee.me>

codecov · 2022-03-24T07:24:30Z

Codecov Report

Merging #3056 (cb6c897) into master (ad48499) will increase coverage by 0.16%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3056      +/-   ##
==========================================
+ Coverage   38.24%   38.41%   +0.16%     
==========================================
  Files         105      105              
  Lines        9182     9181       -1     
==========================================
+ Hits         3512     3527      +15     
+ Misses       5361     5346      -15     
+ Partials      309      308       -1

Impacted Files	Coverage Δ
pkg/selector/pod/selector.go	`42.70% <0.00%> (+0.22%)`	⬆️
pkg/selector/generic/mode.go	`28.20% <0.00%> (+2.56%)`	⬆️
.../workflow/controllers/workflow_entry_reconciler.go	`52.91% <0.00%> (+6.87%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 187418f...cb6c897. Read the comment docs.

pkg/chaosctl/cmd/recover.go

Signed-off-by: xixi <i@hexilee.me>

WangXiangUSTC

rest LGTM

pkg/chaosctl/cmd/recover.go

Signed-off-by: xixi <i@hexilee.me>

WangXiangUSTC

LGTM

cwen0 · 2022-03-29T07:27:58Z

pkg/chaosctl/cmd/recover.go

+Currently unimplemented.
+
+Examples:
+  # Recover network chaos from pods in namespace default


Does the feature support recover chaos experiment by specific chaos experiment name and namepsace?

Doesn't support. It's designed to forcedly recover pods, we should not assume the Chaos Mesh still works as expected. Moreover, if multiple experiments affect the same pod, we cannot only recover one of them forcedly.

Why just default namespace here? Can we support recover on a specific namespace?

cwen0 · 2022-03-30T10:09:39Z

pkg/chaosctl/cmd/recover.go

+
+	recoverCmd.PersistentFlags().StringVarP(&o.namespace, "namespace", "n", "default", "namespace to find pods")
+	o.labels = recoverCmd.PersistentFlags().StringSliceP("label", "l", nil, "labels to select pods")
+	err := recoverCmd.RegisterFlagCompletionFunc("namespace", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {


When is the registered function will be called?

When you enter TAB (auto-completion).

cwen0 · 2022-03-30T10:30:04Z

pkg/chaosctl/cmd/recover.go

+		selector.Pods = map[string][]string{o.namespace: names}
+	}
+
+	labelSelector := map[string]string{}


You can use pkg/label pkg to parse label directly.

cwen0 · 2022-03-30T10:44:30Z

pkg/chaosctl/debug/networkchaos.go

@@ -54,8 +55,8 @@ func (d *networkDebugger) Collect(ctx context.Context, namespace, chaosName stri
 					Name      string
 					Pod       struct {
 						Ipset    string


NetworkChaos experiment may use multiple IPSets. Here may need to use []string type.

IPSets are unnecessary in forced recovery, we don't need to parse it server-side in this PR. If it's necessary for other use-cases, we should parse it in another PR.

cwen0 · 2022-03-30T10:50:51Z

pkg/ctrl/client/ctrlclient.go

 )

 type CtrlClient struct {
 	QueryClient        *graphql.Client
 	SubscriptionClient *graphql.SubscriptionClient
 }

+type PartialPod struct {


Can you add some comments to descript what this struct is and when to use it?

Sure, now the PartialPod is moved to pkg/chaosctl/recover .

Signed-off-by: xixi <i@hexilee.me>

Andrewmatilde

Rest LGTM, I think some of this PR may be changed in the following PR of recover in chaosctl.

pkg/chaosctl/cmd/recover.go

Signed-off-by: xixi <i@hexilee.me>

Hexilee · 2022-04-02T07:36:40Z

@Andrewmatilde PTAL again!

cwen0

LGTM

cwen0 · 2022-04-02T07:57:32Z

/merge

ti-chi-bot · 2022-04-02T07:57:34Z

This pull request has been accepted and is ready to merge.

Commit hash: 81c02b1

Hexilee added 20 commits March 7, 2022 17:39

kill processes works

4e460a4

Signed-off-by: xixi <i@hexilee.me>

support podSelector

b76c6fd

Signed-off-by: xixi <i@hexilee.me>

build ctrl server by fx

8fbfea9

Signed-off-by: xixi <i@hexilee.me>

make check

ec24dc0

Signed-off-by: xixi <i@hexilee.me>

add recover subcommand

db556fe

Signed-off-by: xixi <i@hexilee.me>

merge from master

9580e50

Signed-off-by: xixi <i@hexilee.me>

support httpchaos forcedly recover

b5d4d46

Signed-off-by: xixi <i@hexilee.me>

add partial pod

97bf0c4

Signed-off-by: xixi <i@hexilee.me>

support iochaos recover

f41ecaf

Signed-off-by: xixi <i@hexilee.me>

add PipelineRecover and CleanProcessRecover

7561b9b

Signed-off-by: xixi <i@hexilee.me>

support stressChaos

98528a0

Signed-off-by: xixi <i@hexilee.me>

split tcQdisc and iptables rules in ctrl server

ab01c0e

Signed-off-by: xixi <i@hexilee.me>

ctrl server support clean tcs and iptables

fe53537

Signed-off-by: xixi <i@hexilee.me>

complete recover of network chaos

2eae1d6

Signed-off-by: xixi <i@hexilee.me>

support label selector

5ebcdfe

Signed-off-by: xixi <i@hexilee.me>

merge from master

db36e97

Signed-off-by: xixi <i@hexilee.me>

make check

1e93974

Signed-off-by: xixi <i@hexilee.me>

merge from master

1c72bad

Signed-off-by: xixi <i@hexilee.me>

remove specific recovery implementations

ed0df54

Signed-off-by: xixi <i@hexilee.me>

add noopRecover

e156287

Signed-off-by: xixi <i@hexilee.me>

ti-chi-bot requested a review from WangXiangUSTC March 24, 2022 07:12

ti-chi-bot added the size/XXL label Mar 24, 2022

remove mutation from ctrlserver

a0f49b7

Signed-off-by: xixi <i@hexilee.me>

Hexilee requested review from cwen0 and Andrewmatilde March 24, 2022 07:26

WangXiangUSTC reviewed Mar 25, 2022

View reviewed changes

pkg/chaosctl/cmd/recover.go Show resolved Hide resolved

pkg/chaosctl/cmd/recover.go Outdated Show resolved Hide resolved

pkg/chaosctl/cmd/recover.go Outdated Show resolved Hide resolved

Hexilee added 2 commits March 25, 2022 11:21

fix comments

4b3b70d

Signed-off-by: xixi <i@hexilee.me>

merge from master

7866287

Signed-off-by: xixi <i@hexilee.me>

make check

caa0397

Signed-off-by: xixi <i@hexilee.me>

WangXiangUSTC approved these changes Mar 25, 2022

View reviewed changes

pkg/chaosctl/cmd/recover.go Outdated Show resolved Hide resolved

ti-chi-bot added the status/LGT1 label Mar 25, 2022

Hexilee added 2 commits March 28, 2022 14:36

merge from master

6c1f98d

Signed-off-by: xixi <i@hexilee.me>

add more examples in description

5181f65

Signed-off-by: xixi <i@hexilee.me>

WangXiangUSTC approved these changes Mar 28, 2022

View reviewed changes

cwen0 reviewed Mar 30, 2022

View reviewed changes

Hexilee added 5 commits March 31, 2022 12:35

parse labels by pkg/labels

ca757a4

Signed-off-by: xixi <i@hexilee.me>

move PartialPod to pkg/chaosctl

4f3973a

Signed-off-by: xixi <i@hexilee.me>

merge from master

419a4a8

Signed-off-by: xixi <i@hexilee.me>

make check

653b3d1

Signed-off-by: xixi <i@hexilee.me>

merge from master

d4ce02d

Signed-off-by: xixi <i@hexilee.me>

Andrewmatilde reviewed Apr 2, 2022

View reviewed changes

pkg/chaosctl/cmd/recover.go Outdated Show resolved Hide resolved

pkg/chaosctl/cmd/recover.go Outdated Show resolved Hide resolved

modify description

81c02b1

Signed-off-by: xixi <i@hexilee.me>

cwen0 approved these changes Apr 2, 2022

View reviewed changes

ti-chi-bot added status/LGT2 and removed status/LGT1 labels Apr 2, 2022

ti-chi-bot added the status/can-merge label Apr 2, 2022

Merge branch 'master' into chaosctl-add-recover-subcommand

cb6c897

ti-chi-bot merged commit b4b3374 into chaos-mesh:master Apr 2, 2022

Hexilee mentioned this pull request Apr 29, 2022

chaosctl release v2.2.0 #3212

Closed

4 tasks

cwen0 mentioned this pull request Jul 14, 2022

Promote "Chenxi Li" to committer #3451

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chaosctl add recover subcommand #3056

chaosctl add recover subcommand #3056

Hexilee commented Mar 24, 2022

ti-chi-bot commented Mar 24, 2022 •

edited

codecov bot commented Mar 24, 2022 •

edited

WangXiangUSTC left a comment

WangXiangUSTC left a comment

cwen0 Mar 29, 2022

Hexilee Mar 31, 2022 •

edited

Andrewmatilde Apr 2, 2022

cwen0 Mar 30, 2022

Hexilee Mar 31, 2022

cwen0 Mar 30, 2022

Hexilee Mar 31, 2022

cwen0 Mar 30, 2022

Hexilee Mar 31, 2022

cwen0 Mar 30, 2022

Hexilee Mar 31, 2022

Andrewmatilde left a comment

Hexilee commented Apr 2, 2022

cwen0 left a comment

cwen0 commented Apr 2, 2022

ti-chi-bot commented Apr 2, 2022

chaosctl add recover subcommand #3056

chaosctl add recover subcommand #3056

Conversation

Hexilee commented Mar 24, 2022

What problem does this PR solve?

What's changed and how it works?

Related changes

Checklist

Release note

DCO

ti-chi-bot commented Mar 24, 2022 • edited

codecov bot commented Mar 24, 2022 • edited

Codecov Report

WangXiangUSTC left a comment

Choose a reason for hiding this comment

WangXiangUSTC left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hexilee Mar 31, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Andrewmatilde left a comment

Choose a reason for hiding this comment

Hexilee commented Apr 2, 2022

cwen0 left a comment

Choose a reason for hiding this comment

cwen0 commented Apr 2, 2022

ti-chi-bot commented Apr 2, 2022

ti-chi-bot commented Mar 24, 2022 •

edited

codecov bot commented Mar 24, 2022 •

edited

Hexilee Mar 31, 2022 •

edited