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 an unsafe lock operation and adjust some logging levels (#20381) #20424

Merged
merged 7 commits into from Nov 12, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #20381 to release-3.0


What problem does this PR solve?

Issue Number: close #20366

Problem Summary: statistics: fix an unsafe lock operation and adjust some logging levels

What is changed and how it works?

There is a pair of functions:

func (h *Handle) getStatsReader(...) (...) {
    h.mu.Lock()
    ...
}
func (h *Handle) releaseStatsReader(...) (...) {
    h.mu.Unlock()
    ...
}

Now we use them as below:

_, err := h.getStatsReader()
if err != nil {
    return err
}
defer h.releaseStatsReader()

If getStatsReader returns an error, the lock will not be released.
This PR releases the lock in getStatsReader when errors occur.

This PR also upgrades some logging levels.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • statistics: fix an unsafe lock operation and adjust some logging levels

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@qw4990
Copy link
Contributor

qw4990 commented Nov 11, 2020

/run-all-tests

Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 11, 2020
@bb7133
Copy link
Member

bb7133 commented Nov 11, 2020

LGTM

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 11, 2020
@SunRunAway
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 11, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@bb7133
Copy link
Member

bb7133 commented Nov 12, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 20681
  • 20828

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 6cf4e32 into pingcap:release-3.0 Nov 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/statistics sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/3.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants