Skip to content

session: fix upgrade process for bootstrap v90 (#34862)#34870

Merged
ti-chi-bot merged 1 commit intopingcap:release-6.1from
ti-srebot:release-6.1-388b3c79cc3a
May 23, 2022
Merged

session: fix upgrade process for bootstrap v90 (#34862)#34870
ti-chi-bot merged 1 commit intopingcap:release-6.1from
ti-srebot:release-6.1-388b3c79cc3a

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 22, 2022 •
edited
Loading

cherry-pick #34862 to release-6.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/34870

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/34870:release-6.1-388b3c79cc3a

What problem does this PR solve?

Issue Number: close #34847

Problem Summary:

The bootstrap upgrade process did not work when there was no config file present. It has been fixed to handle this case correctly.

What is changed and how it works?

Check List

Tests

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

My upgrade script:

#!/bin/bash

killall -9 tidb-server tikv-server pd-server my-tidb-server
rm -rf /tmp/tidb*
rm -rf /tmp/100*_tidb/
/tmp/my-tidb-server -L warn &

cd ~/go/src/github.com/morgo/tidb
make

sleep 5 

killall -9 tidb-server tikv-server pd-server my-tidb-server
./bin/tidb-server -L warn # -config ~/.tidb.toml

Previous output (trimmed for readability):

["enable-batch-dml is now configured by the system variable tidb_enable_batch_dml. One-time importing the value specified in tidb.toml file"] [value=OFF]
["mem-quota-query is now configured by the system variable tidb_mem_quota_query. One-time importing the value specified in tidb.toml file"] [value=0]
["query-log-max-len is now configured by the system variable tidb_query_log_max_len. One-time importing the value specified in tidb.toml file"] [value="0 10"]
["committer-concurrency is now configured by the system variable tidb_committer_concurrency. One-time importing the value specified in tidb.toml file"] [value=0]
["run-auto-analyze is now configured by the system variable tidb_enable_auto_analyze. One-time importing the value specified in tidb.toml file"] [value=OFF]
["oom-action is now configured by the system variable tidb_mem_oom_action. One-time importing the value specified in tidb.toml file"] [value=]
["prepared-plan-cache.enable is now configured by the system variable tidb_enable_prepared_plan_cache. One-time importing the value specified in tidb.toml file"] [value=OFF]
["prepared-plan-cache.capacity is now configured by the system variable tidb_prepared_plan_cache_size. One-time importing the value specified in tidb.toml file"] [value=1000]
["prepared-plan-cache.memory-guard-ratio is now configured by the system variable tidb_prepared_plan_cache_memory_guard_ratio. One-time importing the value specified in tidb.toml file"] [value=0.1]

New output:

["enable-batch-dml is now configured by the system variable tidb_enable_batch_dml. One-time importing the value specified in tidb.toml file"] [value=OFF]
["run-auto-analyze is now configured by the system variable tidb_enable_auto_analyze. One-time importing the value specified in tidb.toml file"] [value=OFF]
["prepared-plan-cache.enable is now configured by the system variable tidb_enable_prepared_plan_cache. One-time importing the value specified in tidb.toml file"] [value=OFF]
["prepared-plan-cache.capacity is now configured by the system variable tidb_prepared_plan_cache_size. One-time importing the value specified in tidb.toml file"] [value=1000]
["prepared-plan-cache.memory-guard-ratio is now configured by the system variable tidb_prepared_plan_cache_memory_guard_ratio. One-time importing the value specified in tidb.toml file"] [value=0.1]

Confirming that it still works when a config file is present:

["enable-batch-dml is now configured by the system variable tidb_enable_batch_dml. One-time importing the value specified in tidb.toml file"] [value=ON]
["mem-quota-query is now configured by the system variable tidb_mem_quota_query. One-time importing the value specified in tidb.toml file"] [value=1073741824]
["query-log-max-len is now configured by the system variable tidb_query_log_max_len. One-time importing the value specified in tidb.toml file"] [value=4096]
["committer-concurrency is now configured by the system variable tidb_committer_concurrency. One-time importing the value specified in tidb.toml file"] [value=128]
["run-auto-analyze is now configured by the system variable tidb_enable_auto_analyze. One-time importing the value specified in tidb.toml file"] [value=ON]
["oom-action is now configured by the system variable tidb_mem_oom_action. One-time importing the value specified in tidb.toml file"] [value=cancel]
["prepared-plan-cache.enable is now configured by the system variable tidb_enable_prepared_plan_cache. One-time importing the value specified in tidb.toml file"] [value=OFF]
["prepared-plan-cache.capacity is now configured by the system variable tidb_prepared_plan_cache_size. One-time importing the value specified in tidb.toml file"] [value=1000]
["prepared-plan-cache.memory-guard-ratio is now configured by the system variable tidb_prepared_plan_cache_memory_guard_ratio. One-time importing the value specified in tidb.toml file"] [value=0.1]
  • 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

@morgo @ti-srebot
cherry pick pingcap#34862 to release-6.1
8dc8496 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner May 22, 2022 04:19
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 22, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • windtalker

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.

Details

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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 22, 2022
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 22, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 22, 2022
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.1-cherry-pick labels May 22, 2022
@ti-srebot ti-srebot mentioned this pull request May 22, 2022
Merged
12 tasks
@ti-srebot ti-srebot requested review from bb7133 and ngaut May 22, 2022 04:19
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 22, 2022

@morgo you're already a collaborator in bot's repo.

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 23, 2022
bb7133
bb7133 approved these changes May 23, 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 23, 2022
windtalker
windtalker approved these changes May 23, 2022
View reviewed changes
Copy link
Contributor

@windtalker windtalker 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 23, 2022
@windtalker
Copy link
Contributor

windtalker commented May 23, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 23, 2022

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

DetailsCommit hash: 8dc8496

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 23, 2022
@bb7133
Copy link
Member

bb7133 commented May 23, 2022

/run-mysql-test

@bb7133
Copy link
Member

bb7133 commented May 23, 2022

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented May 23, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/8dc8496d0ec4456480fcbe4fbaa027727de7932a

@ti-chi-bot ti-chi-bot merged commit f876236 into pingcap:release-6.1 May 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bb7133 bb7133 bb7133 approved these changes

@windtalker windtalker windtalker approved these changes

@ngaut ngaut Awaiting requested review from ngaut

Assignees

@morgo morgo

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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. type/6.1-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @windtalker @bb7133 @sre-bot @morgo @VelocityLight