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

statistics: fix panic when getStatsReader fail (#15651) #15711

Merged
merged 3 commits into from
Mar 26, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Mar 26, 2020

cherry-pick #15651 to release-4.0


What problem does this PR solve?

The defer func is not placed correctly. Thus it would panic in some cases.

What is changed and how it works?

Check the error before the defer func. Avoid potential panic.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

@sre-bot sre-bot requested a review from a team as a code owner March 26, 2020 05:18
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 26, 2020

/run-all-tests

Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 26, 2020
Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

LGTM

@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 26, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 26, 2020

Your auto merge job has been accepted, waiting for 15628, 15635

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 26, 2020

/run-all-tests

@winoros
Copy link
Member

winoros commented Mar 26, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Mar 26, 2020

Sorry @winoros, you don't have permission to trigger auto merge event on this branch.

@SunRunAway SunRunAway added status/can-merge Indicates a PR has been approved by a committer. and removed status/can-merge Indicates a PR has been approved by a committer. labels Mar 26, 2020
@zz-jason zz-jason merged commit ff0c182 into pingcap:release-4.0 Mar 26, 2020
@winoros winoros deleted the release-4.0-2846f5c5ba1f branch July 16, 2020 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/statistics status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants