Skip to content

session: fix dml_batch_size doesn't load the global variable (#24710)#24730

Closed
ti-srebot wants to merge 8 commits intopingcap:release-4.0from
ti-srebot:release-4.0-44830b917465
Closed

session: fix dml_batch_size doesn't load the global variable (#24710)#24730
ti-srebot wants to merge 8 commits intopingcap:release-4.0from
ti-srebot:release-4.0-44830b917465

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 18, 2021 •
edited
Loading

cherry-pick #24710 to release-4.0
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/24730

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

git push git@github.com:ti-srebot/tidb.git pr/24730:release-4.0-44830b917465

What problem does this PR solve?

Issue Number: close #24709

Problem Summary:
No TiDBDMLBatchSize in builtinGlobalVariable. So when loading the global variable, it misses TiDBDMLBatchSize.

What is changed and how it works?

Add TiDBDMLBatchSize to builtinGlobalVariable.

How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

Release note

  • fix dml_batch_size doesn't load the global variable

@wjhuang2016 @ti-srebot
cherry pick pingcap#24710 to release-4.0
9195081 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 18, 2021

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved (/lgtm + /merge) by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Details

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 kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 18, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request May 18, 2021
Merged
@ti-srebot ti-srebot added sig/sql-infra SIG: SQL Infra size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels May 18, 2021
@ti-srebot ti-srebot requested review from cfzjywxk and xiongjiwei May 18, 2021 16:26
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 18, 2021
@ti-srebot ti-srebot added this to the v4.0.13 milestone May 18, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented May 18, 2021

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

@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 19, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 9, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tiancaiamao
  • xiongjiwei

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 the status/LGT1 Indicates that a PR has LGTM 1. label Jun 9, 2021
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 8, 2021
@cfzjywxk
Copy link
Contributor

cfzjywxk commented Jul 9, 2021

@wjhuang2016
Seems this fix is missing in the bug triage document?

@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 Nov 17, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 19, 2021
@tiancaiamao
Copy link
Contributor

tiancaiamao commented Nov 19, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 19, 2021

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

DetailsCommit hash: a875434

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 19, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 22, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

Details

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.

@wjhuang2016
Copy link
Member

wjhuang2016 commented Nov 22, 2021

/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 Nov 22, 2021
@tiancaiamao
Copy link
Contributor

tiancaiamao commented Nov 22, 2021

dml_batch_size is a session variable in 4.0, not a global one, so 4.0 doesn't need this fix.

@wjhuang2016
Copy link
Member

wjhuang2016 commented Nov 22, 2021

Close this issue since dml_batch_size is a session variable.

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

Reviewers

@tiancaiamao tiancaiamao tiancaiamao approved these changes

@cfzjywxk cfzjywxk Awaiting requested review from cfzjywxk

+1 more reviewer

@xiongjiwei xiongjiwei xiongjiwei approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@wjhuang2016 wjhuang2016

Labels

cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. sig/sql-infra SIG: SQL Infra 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/bugfix This PR fixes a bug. type/4.0-cherry-pick

Projects

None yet

Milestone

v4.0.13

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @cfzjywxk @tiancaiamao @wjhuang2016 @xiongjiwei @zhouqiang-cl