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

Fix storage configuration compatibility. #3019

Merged
merged 8 commits into from
Sep 8, 2021
Merged

Fix storage configuration compatibility. #3019

merged 8 commits into from
Sep 8, 2021

Conversation

JinheLin
Copy link
Contributor

@JinheLin JinheLin commented Sep 6, 2021

What problem does this PR solve?

Issue Number: close #2781, close #1760

Problem Summary:

What is changed and how it works?

What's Changed:

  1. Remove useless configuration: storage.bg_task_io_rate_limit.
  2. Move format_version and lazily_init_store from TiFlashStorageConfig::parse to TiFlashStorageConfig::parseMisc, and call parseMisc when configuration has [storage] section.
  3. Rename TiFlashStorageConfig::parse to TiFlashStorageConfig::parseStoragePath and call parseStoragePath when configuration has [storage.main] section instead of has [storage] section.

Related changes

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

Check List

Tests

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

Side effects

Release note

none

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 6, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JaySon-Huang

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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 6, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 6, 2021
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

Maybe we should totally remove bg_task_io_rate_limit from our docs (for the master and 5.2).
Since it is only an experimental config in v5.0/v5.1 and we don't support it anymore since v5.2

https://github.com/pingcap/docs-cn/blob/807a818b7f9c8fca4746509856ffdd5bfd95f984/tiflash/tiflash-configuration.md

dbms/src/Server/StorageConfigParser.cpp Outdated Show resolved Hide resolved
dbms/src/Server/StorageConfigParser.h Outdated Show resolved Hide resolved
dbms/src/Server/StorageConfigParser.cpp Show resolved Hide resolved
dbms/src/Server/StorageConfigParser.cpp Outdated Show resolved Hide resolved
dbms/src/Server/StorageConfigParser.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@JaySon-Huang JaySon-Huang 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 7, 2021
@JinheLin
Copy link
Contributor Author

JinheLin commented Sep 8, 2021

/merge

@ti-chi-bot
Copy link
Member

@JinheLin: 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
Copy link
Member

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

Commit hash: 2f8938a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 8, 2021
@ti-chi-bot ti-chi-bot merged commit 4674a46 into pingcap:master Sep 8, 2021
@JaySon-Huang JaySon-Huang added the needs-cherry-pick-release-5.2 PR which needs to be cherry-picked to release-5.2 label Sep 8, 2021
ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Sep 8, 2021
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #3049.

@JaySon-Huang JaySon-Huang deleted the fix_config branch September 8, 2021 03:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.2 PR which needs to be cherry-picked to release-5.2 release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DBaaS : tiflash upgrade to v5.2.0 failed
3 participants