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_controller: prevent loadServerConfig from panic #7361

Merged
merged 1 commit into from
Nov 13, 2023
Merged

resource_controller: prevent loadServerConfig from panic #7361

merged 1 commit into from
Nov 13, 2023

Conversation

JmPotato
Copy link
Member

@JmPotato JmPotato commented Nov 13, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #7360.

What is changed and how does it work?

Prevent `loadServerConfig` from panic.

Check List

Tests

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

image

Release note

None.

@JmPotato
Prevent loadServerConfig from panic
85e897f 
Signed-off-by: JmPotato <ghzpotato@gmail.com>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 13, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • HuSharp

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 bot added do-not-merge/needs-triage-completed 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. labels Nov 13, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 13, 2023
@JmPotato
Copy link
Member Author

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 13, 2023
@JmPotato
Copy link
Member Author

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 13, 2023

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

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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 ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 13, 2023

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

Commit hash: 85e897f

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 13, 2023
@ti-chi-bot ti-chi-bot bot merged commit be31c08 into tikv:master Nov 13, 2023
23 checks passed
@JmPotato JmPotato deleted the prevent_panic_loadServerConfig branch November 13, 2023 11:02
@nolouch nolouch added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Nov 16, 2023
@nolouch
Copy link
Contributor

nolouch commented Nov 16, 2023

/run-cherry-picker

@ti-chi-bot ti-chi-bot mentioned this pull request Nov 16, 2023
Closed
@ti-chi-bot
Copy link
Member

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

nolouch pushed a commit to ti-chi-bot/pd that referenced this pull request Nov 16, 2023
@JmPotato @nolouch
resource_controller: prevent loadServerConfig from panic (tikv#7361)
4255a28 
close tikv#7360

Prevent `loadServerConfig` from panic.

Signed-off-by: JmPotato <ghzpotato@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HuSharp HuSharp HuSharp approved these changes

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@nolouch nolouch Awaiting requested review from nolouch

Assignees
No one assigned
Labels
component/client Client logic. component/resource-control needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. 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.

Panic during initializing ResourceGroupController
5 participants
@JmPotato @nolouch @ti-chi-bot @CabinfeverB @HuSharp