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

config: update deprecatedConfig to pass config check #34780

Merged
merged 7 commits into from
May 18, 2022
Merged

config: update deprecatedConfig to pass config check #34780

merged 7 commits into from
May 18, 2022

Conversation

xuyifangreeneyes
Copy link
Contributor

@xuyifangreeneyes xuyifangreeneyes commented May 18, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #34771

Problem Summary:

What is changed and how it works?

Update deprecatedConfig to pass config check during the upgrade procedure.

Check List

Tests

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

tidb.toml

mem-quota-query = 0

[experimental]
enable-global-kill = true

[log]
query-log-max-len = 4000

[performance]
committer-concurrency = 120

[security]
require-secure-transport = false

Before the PR:

./tidb-server --config-check --config=./tidb.toml
[2022/05/18 21:22:30.863 +08:00] [FATAL] [terror.go:292] ["unexpected error"] [error="config file ./tidb.toml contained invalid configuration options: mem-quota-query, experimental.enable-global-kill, log.query-log-max-len, performance.committer-concurrency, security.require-secure-transport; check TiDB manual to make sure this option has not been deprecated and removed from your TiDB version if the option does not appear to be a typo"] [stack="github.com/pingcap/tidb/parser/terror.MustNil\n\t/Users/xuyifan/tidb/parser/terror/terror.go:292\ngithub.com/pingcap/tidb/config.InitializeConfig\n\t/Users/xuyifan/tidb/config/config.go:987\nmain.main\n\t/Users/xuyifan/tidb/tidb-server/main.go:170\nruntime.main\n\t/usr/local/go/src/runtime/proc.go:250"] [stack="github.com/pingcap/tidb/parser/terror.MustNil\n\t/Users/xuyifan/tidb/parser/terror/terror.go:292\ngithub.com/pingcap/tidb/config.InitializeConfig\n\t/Users/xuyifan/tidb/config/config.go:987\nmain.main\n\t/Users/xuyifan/tidb/tidb-server/main.go:170\nruntime.main\n\t/usr/local/go/src/runtime/proc.go:250"]

After the PR:

./tidb-server --config-check --config=./tidb.toml
config file ./tidb.toml contained invalid configuration options: mem-quota-query, experimental.enable-global-kill, log.query-log-max-len, performance.committer-concurrency, security.require-secure-transport; check TiDB manual to make sure this option has not been deprecated and removed from your TiDB version if the option does not appear to be a typo
config check successful

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 May 18, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • morgo

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

/cc @chrysan @Yisaer @winoros @qw4990

@sre-bot
Copy link
Contributor

sre-bot commented May 18, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/620ed2ba30baa50416913ae0df67b4a729f57d1c

@bb7133
Copy link
Member

bb7133 commented May 18, 2022

Could you add some manual test steps in 'manual test part'? You could add '[experimental]enable-global-kill' in TiDB configuration file and verify it by tidb-server --config-check --config=tidb.toml.

bb7133
bb7133 approved these changes May 18, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 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 May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

Could you add some manual test steps in 'manual test part'? You could add '[experimental]enable-global-kill' in TiDB configuration file and verify it by tidb-server --config-check --config=tidb.toml.

Updated.

@morgo morgo self-requested a review May 18, 2022 13:05
@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 May 18, 2022
@morgo
Copy link
Contributor

morgo commented May 18, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 72539ed

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

@morgo We plan to fix other deprecated configs in the pr, too. Hence I hold the merge until I finish that.

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 18, 2022
@xuyifangreeneyes xuyifangreeneyes changed the title config: remain old experimental.enable-global-kill for upgrade config: update deprecatedConfig to pass config check May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2022
@xuyifangreeneyes
Copy link
Contributor Author

@bb7133 @morgo PTAL

@morgo
Copy link
Contributor

morgo commented May 18, 2022

LGTM

@morgo
Copy link
Contributor

morgo commented May 18, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: dff0fb9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 18, 2022
@ti-chi-bot ti-chi-bot merged commit 026480b into pingcap:master May 18, 2022
@sre-bot
Copy link
Contributor

sre-bot commented May 18, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [2] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/sqllogic-test-1 🟥 failed 2, success 24, total 26 8 min 39 sec New failing
idc-jenkins-ci-tidb/mybatis-test 🟥 failed 1, success 0, total 1 3 min 18 sec New failing
idc-jenkins-ci/integration-cdc-test 🔴 failed 1, success 33, total 34 38 min Existing failure
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 25 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 9 min 37 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 6 min 18 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 10 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morgo morgo morgo approved these changes

@bb7133 bb7133 bb7133 approved these changes

@chrysan chrysan Awaiting requested review from chrysan

@qw4990 qw4990 Awaiting requested review from qw4990

@winoros winoros Awaiting requested review from winoros

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees
No one assigned
Labels
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.

when tidb has some deprecated configurations , upgrade from 6.0.0 to nightly fail
5 participants
@xuyifangreeneyes @ti-chi-bot @sre-bot @bb7133 @morgo