chaos-daemon support graceful shutdown #2668

Hexilee · 2021-12-17T05:54:41Z

What problem does this PR solve?

Close #2650

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 · 2021-12-17T05:54:42Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

Andrewmatilde
YangKeao

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.

codecov · 2022-01-11T15:50:08Z

Codecov Report

Merging #2668 (4729fee) into master (f3e2951) will decrease coverage by 0.30%.
The diff coverage is 4.00%.

@@            Coverage Diff             @@
##           master    #2668      +/-   ##
==========================================
- Coverage   41.05%   40.74%   -0.31%     
==========================================
  Files         147      147              
  Lines       11991    12033      +42     
==========================================
- Hits         4923     4903      -20     
- Misses       6701     6761      +60     
- Partials      367      369       +2

Impacted Files	Coverage Δ
pkg/bpm/bpm.go	`34.04% <0.00%> (-5.47%)`	⬇️
pkg/chaosdaemon/server.go	`36.27% <8.33%> (-2.11%)`	⬇️
pkg/workflow/controllers/chaos_node_reconciler.go	`55.87% <0.00%> (-5.45%)`	⬇️

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 f3e2951...4729fee. Read the comment docs.

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

Hexilee · 2022-01-12T06:19:59Z

/run-e2e-tests

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

pkg/chaosdaemon/server.go

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

Hexilee · 2022-01-13T04:28:35Z

/run-e2e-tests

pkg/chaosdaemon/server.go

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

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

Hexilee · 2022-02-11T07:52:55Z

/run-e2e-tests

Andrewmatilde

LGTM

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

YangKeao

LGTM

Hexilee · 2022-02-17T08:20:42Z

/merge

ti-chi-bot · 2022-02-17T08:20:44Z

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

Commit hash: 8977272

Hexilee · 2022-02-17T08:49:04Z

/run-e2e-tests

Hexilee · 2022-02-17T09:32:31Z

/run-e2e-tests

* add Shutdown method for bpm Signed-off-by: xixi <i@hexilee.me> * chaos-daemon support graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix duplicated daemonServer Signed-off-by: xixi <i@hexilee.me> * add e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * make fmt Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * add graceful shutdown test for io chaos Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * skip Graceful test in e2e Signed-off-by: xixi <i@hexilee.me> * go mod tidy Signed-off-by: xixi <i@hexilee.me> * add additional e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * change test groups of graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix errors handling Signed-off-by: xixi <i@hexilee.me> * wait more time for restarting Signed-off-by: xixi <i@hexilee.me> * add more test case Signed-off-by: xixi <i@hexilee.me> * delete custom resources after graceful shutdown test Signed-off-by: xixi <i@hexilee.me> * fix ginkgo usages Signed-off-by: xixi <i@hexilee.me> * cancel after deleting resources Signed-off-by: xixi <i@hexilee.me> * remove duplicated tests Signed-off-by: xixi <i@hexilee.me> * remove graceful restart cases; they are bugs instead of features Signed-off-by: xixi <i@hexilee.me> * fix code style Signed-off-by: Hexilee <i@hexilee.me> * mod tidy Signed-off-by: Hexilee <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> Co-authored-by: Andrewmatilde <davis6813585853062@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io> Signed-off-by: mikechengwei <842725815@qq.com>

This reverts commit b4181f4.

…)"" This reverts commit e53d8bd.

* add Shutdown method for bpm Signed-off-by: xixi <i@hexilee.me> * chaos-daemon support graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix duplicated daemonServer Signed-off-by: xixi <i@hexilee.me> * add e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * make fmt Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * add graceful shutdown test for io chaos Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * skip Graceful test in e2e Signed-off-by: xixi <i@hexilee.me> * go mod tidy Signed-off-by: xixi <i@hexilee.me> * add additional e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * change test groups of graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix errors handling Signed-off-by: xixi <i@hexilee.me> * wait more time for restarting Signed-off-by: xixi <i@hexilee.me> * add more test case Signed-off-by: xixi <i@hexilee.me> * delete custom resources after graceful shutdown test Signed-off-by: xixi <i@hexilee.me> * fix ginkgo usages Signed-off-by: xixi <i@hexilee.me> * cancel after deleting resources Signed-off-by: xixi <i@hexilee.me> * remove duplicated tests Signed-off-by: xixi <i@hexilee.me> * remove graceful restart cases; they are bugs instead of features Signed-off-by: xixi <i@hexilee.me> * fix code style Signed-off-by: Hexilee <i@hexilee.me> * mod tidy Signed-off-by: Hexilee <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> Co-authored-by: Andrewmatilde <davis6813585853062@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

* add Shutdown method for bpm Signed-off-by: xixi <i@hexilee.me> * chaos-daemon support graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix duplicated daemonServer Signed-off-by: xixi <i@hexilee.me> * add e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * make fmt Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * add graceful shutdown test for io chaos Signed-off-by: xixi <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> * skip Graceful test in e2e Signed-off-by: xixi <i@hexilee.me> * go mod tidy Signed-off-by: xixi <i@hexilee.me> * add additional e2e test for graceful shutdown Signed-off-by: xixi <i@hexilee.me> * change test groups of graceful shutdown Signed-off-by: xixi <i@hexilee.me> * fix errors handling Signed-off-by: xixi <i@hexilee.me> * wait more time for restarting Signed-off-by: xixi <i@hexilee.me> * add more test case Signed-off-by: xixi <i@hexilee.me> * delete custom resources after graceful shutdown test Signed-off-by: xixi <i@hexilee.me> * fix ginkgo usages Signed-off-by: xixi <i@hexilee.me> * cancel after deleting resources Signed-off-by: xixi <i@hexilee.me> * remove duplicated tests Signed-off-by: xixi <i@hexilee.me> * remove graceful restart cases; they are bugs instead of features Signed-off-by: xixi <i@hexilee.me> * fix code style Signed-off-by: Hexilee <i@hexilee.me> * mod tidy Signed-off-by: Hexilee <i@hexilee.me> * make check Signed-off-by: xixi <i@hexilee.me> Co-authored-by: Andrewmatilde <davis6813585853062@outlook.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io> Signed-off-by: zhqqqy <zhqqqy@163.com>

Hexilee added 2 commits December 16, 2021 06:56

add Shutdown method for bpm

623668f

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

chaos-daemon support graceful shutdown

4e54cb3

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

ti-chi-bot added the do-not-merge/work-in-progress label Dec 17, 2021

ti-chi-bot requested review from cwen0 and fewdan December 17, 2021 05:54

ti-chi-bot added size/L needs-rebase labels Dec 17, 2021

ti-chi-bot removed the needs-rebase label Jan 11, 2022

Hexilee marked this pull request as ready for review January 11, 2022 15:16

ti-chi-bot removed the do-not-merge/work-in-progress label Jan 11, 2022

Hexilee added 2 commits January 12, 2022 00:20

merge from upstream

1068b20

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

fix duplicated daemonServer

255a2d7

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

ti-chi-bot added size/XL and removed size/L labels Jan 12, 2022

Hexilee added 3 commits January 12, 2022 21:58

add e2e test for graceful shutdown

e60e303

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

make fmt

d9d094b

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

make check

c47ae8f

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

sonatype-lift bot reviewed Jan 12, 2022

View reviewed changes

pkg/chaosdaemon/server.go Show resolved Hide resolved

add graceful shutdown test for io chaos

20e6bd6

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

ti-chi-bot added the needs-rebase label Jan 13, 2022

Hexilee force-pushed the fix-graceful-shutdown branch from 6d10f15 to 20e6bd6 Compare January 13, 2022 04:22

ti-chi-bot removed the needs-rebase label Jan 13, 2022

sonatype-lift bot reviewed Jan 13, 2022

View reviewed changes

pkg/chaosdaemon/server.go Outdated Show resolved Hide resolved

Hexilee mentioned this pull request Jan 13, 2022

bump ginkgo to v2.0.0 #2789

Closed

9 tasks

Hexilee added 2 commits January 13, 2022 20:22

merge from upstream

75a2b3a

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

make check

4a239eb

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

Hexilee added 3 commits February 8, 2022 14:16

fix code style

4f16338

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

merge from master

d7d48c8

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

mod tidy

8b7f47b

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

ti-chi-bot added needs-rebase and removed needs-rebase labels Feb 8, 2022

Andrewmatilde approved these changes Feb 11, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 label Feb 11, 2022

Hexilee added 2 commits February 11, 2022 21:16

make check

9d7a893

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

merge from master

8977272

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

YangKeao approved these changes Feb 17, 2022

View reviewed changes

ti-chi-bot added status/LGT2 and removed status/LGT1 labels Feb 17, 2022

ti-chi-bot added the status/can-merge label Feb 17, 2022

Merge branch 'master' into fix-graceful-shutdown

4729fee

ti-chi-bot merged commit b4181f4 into chaos-mesh:master Feb 17, 2022

STRRL mentioned this pull request Feb 22, 2022

Release v2.2.0 #2608

Closed

51 tasks

Hexilee mentioned this pull request Mar 7, 2022

chaos-tproxy-controller cannot graceful shut down chaos-mesh/chaos-tproxy#34

Closed

basit9958 added a commit to basit9958/chaos-mesh that referenced this pull request Mar 17, 2022

Revert "chaos-daemon support graceful shutdown (chaos-mesh#2668)"

e53d8bd

This reverts commit b4181f4.

basit9958 added a commit to basit9958/chaos-mesh that referenced this pull request Mar 17, 2022

Revert "Revert "chaos-daemon support graceful shutdown (chaos-mesh#2668…

dc7ef62

…)"" This reverts commit e53d8bd.

STRRL added this to the Release 2.2 milestone Apr 15, 2022

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

chaos-daemon support graceful shutdown #2668

chaos-daemon support graceful shutdown #2668

Hexilee commented Dec 17, 2021 •

edited

ti-chi-bot commented Dec 17, 2021 •

edited

codecov bot commented Jan 11, 2022 •

edited

Hexilee commented Jan 12, 2022

Hexilee commented Jan 13, 2022

Hexilee commented Feb 11, 2022

Andrewmatilde left a comment

YangKeao left a comment

Hexilee commented Feb 17, 2022

ti-chi-bot commented Feb 17, 2022

Hexilee commented Feb 17, 2022

Hexilee commented Feb 17, 2022

chaos-daemon support graceful shutdown #2668

chaos-daemon support graceful shutdown #2668

Conversation

Hexilee commented Dec 17, 2021 • edited

What problem does this PR solve?

What's changed and how it works?

Related changes

Checklist

Release note

DCO

ti-chi-bot commented Dec 17, 2021 • edited

codecov bot commented Jan 11, 2022 • edited

Codecov Report

Hexilee commented Jan 12, 2022

Hexilee commented Jan 13, 2022

Hexilee commented Feb 11, 2022

Andrewmatilde left a comment

Choose a reason for hiding this comment

YangKeao left a comment

Choose a reason for hiding this comment

Hexilee commented Feb 17, 2022

ti-chi-bot commented Feb 17, 2022

Hexilee commented Feb 17, 2022

Hexilee commented Feb 17, 2022

Hexilee commented Dec 17, 2021 •

edited

ti-chi-bot commented Dec 17, 2021 •

edited

codecov bot commented Jan 11, 2022 •

edited