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.

Sign up for GitHub

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

Jump to bottom

store: fix panic when failed to create pdclient #42885

Merged
merged 1 commit into from
Apr 10, 2023
Merged

store: fix panic when failed to create pdclient #42885

merged 1 commit into from
Apr 10, 2023

Conversation

D3Hunter
Copy link
Contributor

What problem does this PR solve?

Issue Number: ref #42778

Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    • create store without real-tikv, check it can fail with err
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 10, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • lance6716

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.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-7.0 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 10, 2023
D3Hunter
D3Hunter commented Apr 10, 2023
View reviewed changes
store/driver/tikv_driver.go
@@ -188,11 +188,10 @@ func (d TiKVDriver) OpenWithOptions(path string, options ...Option) (resStore kv
),
pd.WithCustomTimeoutOption(time.Duration(d.pdConfig.PDServerTimeout)*time.Second),
pd.WithForwardingOption(config.GetGlobalConfig().EnableForwarding))
pdCli = util.InterceptedPDClient{Client: pdCli}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this will cause previous defer close panic when failed to create pdclient

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 10, 2023
@lance6716
Copy link
Contributor

@hawkingrei do you know there's a linter that can guard tha if a function returns error, the error must be checked before using other return values?

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 10, 2023
@hawkingrei
Copy link
Member

@hawkingrei do you know there's a linter that can guard tha if a function returns error, the error must be checked before using other return values?

I can't immediately think of it, but I can look for it.

@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4a7d523

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 10, 2023
@hawkingrei
Copy link
Member

/retest

1 similar comment
@D3Hunter
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot merged commit 86924ae into master Apr 10, 2023
@ti-chi-bot ti-chi-bot deleted the fix-new-store branch April 10, 2023 09:11
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 10, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.0: #42894.

ti-chi-bot added a commit that referenced this pull request Apr 11, 2023
@ti-chi-bot
store: fix panic when failed to create pdclient (#42885) (#42894)
ac70ae9 
ref #42778
@HuSharp HuSharp mentioned this pull request Aug 17, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.0 release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@D3Hunter @ti-chi-bot @lance6716 @hawkingrei