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

resource_manager: fix nil possible to avoid panic #6121

Merged
merged 2 commits into from
Mar 9, 2023
Merged

resource_manager: fix nil possible to avoid panic #6121

merged 2 commits into from
Mar 9, 2023

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Mar 9, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Close #6120

What is changed and how does it work?

resource_manager: fix nil possible to avoid panic

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

Release note

None.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 9, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • JmPotato

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. do-not-merge/needs-triage-completed labels Mar 9, 2023
@ti-chi-bot ti-chi-bot requested review from HunDunDM and lhy1024 March 9, 2023 02:21
@nolouch nolouch requested review from CabinfeverB and JmPotato and removed request for lhy1024 and HunDunDM March 9, 2023 02:22
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 9, 2023
@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 Mar 9, 2023
@JmPotato
Copy link
Member

JmPotato commented Mar 9, 2023

/merge

@ti-chi-bot
Copy link
Member

@JmPotato: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

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

Commit hash: 33afca5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 9, 2023
@nolouch nolouch changed the title resource_manager: fix nil poissible to avoid panic resource_manager: fix nil possible to avoid panic Mar 9, 2023
@codecov
Copy link

codecov bot commented Mar 9, 2023 •
edited
Loading

Codecov Report

Patch coverage: 66.66% and no project coverage change

Comparison is base (55bb91a) 74.12% compared to head (a1dff44) 74.12%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #6121   +/-   ##
=======================================
  Coverage   74.12%   74.12%           
=======================================
  Files         385      385           
  Lines       37970    37981   +11     
=======================================
+ Hits        28144    28154   +10     
- Misses       7355     7356    +1     
  Partials     2471     2471
Flag Coverage Δ
unittests 74.12% <66.66%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/mcs/resource_manager/server/grpc_service.go 67.04% <0.00%> (-1.56%) ⬇️
client/resource_group/controller/controller.go 62.24% <76.92%> (+0.32%) ⬆️
pkg/storage/endpoint/rule.go 83.33% <0.00%> (-11.12%) ⬇️
pkg/utils/tempurl/tempurl.go 60.00% <0.00%> (-10.00%) ⬇️
pkg/storage/leveldb_backend.go 76.00% <0.00%> (-8.00%) ⬇️
server/region_syncer/server.go 82.96% <0.00%> (-4.40%) ⬇️
pkg/tso/local_allocator.go 76.31% <0.00%> (-2.64%) ⬇️
pkg/member/member.go 62.69% <0.00%> (-2.08%) ⬇️
server/cluster/coordinator.go 71.59% <0.00%> (-0.76%) ⬇️
server/config/persist_options.go 91.71% <0.00%> (-0.64%) ⬇️
... and 14 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ti-chi-bot ti-chi-bot merged commit cf3424d into tikv:master Mar 9, 2023
@nolouch nolouch deleted the fix-nil branch March 9, 2023 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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.

Unexpect config of resource manager cause PD panic
4 participants
@nolouch @ti-chi-bot @JmPotato @CabinfeverB