Skip to content
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

fix panic with /metrics of chaos-daemon #3025

Merged
merged 2 commits into from
Mar 16, 2022

Conversation

STRRL
Copy link
Member

@STRRL STRRL commented Mar 15, 2022

Signed-off-by: STRRL str_ruiling@outlook.com

What problem does this PR solve?

  • chaos-daemon would panic when access it's /metrics endpoint

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: STRRL <str_ruiling@outlook.com>
@STRRL STRRL added type/bug-fix A bug needs to be fixed. component/daemon labels Mar 15, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 15, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cwen0
  • iguoyr

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
Copy link

codecov bot commented Mar 15, 2022

Codecov Report

Merging #3025 (5be0612) into master (fd258b0) will decrease coverage by 0.24%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3025      +/-   ##
==========================================
- Coverage   38.22%   37.98%   -0.25%     
==========================================
  Files         105      105              
  Lines        9094     9094              
==========================================
- Hits         3476     3454      -22     
- Misses       5314     5333      +19     
- Partials      304      307       +3     
Impacted Files Coverage Δ
pkg/workflow/controllers/deadline_reconciler.go 64.44% <0.00%> (-5.19%) ⬇️
pkg/workflow/controllers/chaos_node_reconciler.go 58.16% <0.00%> (-3.16%) ⬇️
.../workflow/controllers/workflow_entry_reconciler.go 46.03% <0.00%> (-2.12%) ⬇️
pkg/workflow/controllers/utils.go 85.71% <0.00%> (-1.59%) ⬇️
pkg/selector/generic/mode.go 28.20% <0.00%> (+2.56%) ⬆️

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 fd258b0...5be0612. Read the comment docs.

@STRRL
Copy link
Member Author

STRRL commented Mar 16, 2022

PTAL

/cc @Andrewmatilde @Hexilee @iguoyr

Copy link
Member

@cwen0 cwen0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cwen0
Copy link
Member

cwen0 commented Mar 16, 2022

@STRRL Does this pr need to cherry-pick to release-2.1 branch?

@STRRL
Copy link
Member Author

STRRL commented Mar 16, 2022

yes, but it needs manually cheerypick with #2912 which introduce this bug

Copy link
Member

@iguoyr iguoyr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@STRRL
Copy link
Member Author

STRRL commented Mar 16, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5e0e437

@ti-chi-bot ti-chi-bot merged commit 77fee69 into chaos-mesh:master Mar 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants