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

session: fix upgrade #40182

Merged
merged 7 commits into from Feb 16, 2023
Merged

session: fix upgrade #40182

merged 7 commits into from Feb 16, 2023

Conversation

chrysan
Copy link
Contributor

@chrysan chrysan commented Dec 26, 2022 •
edited

What problem does this PR solve?

Issue Number: close #41502

Problem Summary:
It's because https://github.com/pingcap/tidb/pull/40179/files. To make it work when upgrade from v6.5 to master, change the upgrade version.
And leave some version numbers for possible patches for v6.5.x

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • 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

@chrysan chrysan requested a review from a team as a code owner December 26, 2022 16:16
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 26, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • time-and-fate
  • winoros

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 do-not-merge/needs-linked-issue release-note-none size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 26, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 26, 2022
@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 Dec 26, 2022
@chrysan chrysan requested a review from bb7133 December 27, 2022 02:09
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2023
@ti-chi-bot
Copy link
Member

@chrysan: PR needs rebase.

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-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2023
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 16, 2023
@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/retest

@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/test build

@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/test unit-test

@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 Feb 16, 2023
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
@XuHuaiyu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 93798a1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/test unit-test

@hawkingrei
Copy link
Member

/retest

@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/merge

@hawkingrei
Copy link
Member

/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 Feb 16, 2023
@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/test unit-test

1 similar comment
@chrysan
Copy link
Contributor Author

chrysan commented Feb 16, 2023

/test unit-test

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
chrysan
chrysan commented Feb 16, 2023
View reviewed changes
server/tidb_library_test.go
@@ -49,7 +49,7 @@ func TestMemoryLeak(t *testing.T) {
runtime.ReadMemStats(&memStat)
// before the fix, initAndCloseTiDB for 20 times will cost 900 MB memory, so we test for a quite loose upper bound.
if syncutil.EnableDeadlock {
require.Less(t, memStat.HeapInuse-oldHeapInUse, uint64(1100*units.MiB))
require.Less(t, memStat.HeapInuse-oldHeapInUse, uint64(1500*units.MiB))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tests failed several times. Discussed with @hawkingrei to increase this value now and find a better solution later.

Error:              "1158316032" is not less than "1153433600"
Error:              "1162543104" is not less than "1153433600"

@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c08ab0e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 16, 2023
@ti-chi-bot ti-chi-bot merged commit 5df1913 into pingcap:master Feb 16, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 16, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 16, 2023
@chrysan @ti-chi-bot
This is an automated cherry-pick of pingcap#40182
c98fcd1 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Feb 16, 2023
@ti-chi-bot
session: fix upgrade (#40182) (#41517)
b086085 
close #41502
@hawkingrei hawkingrei mentioned this pull request Feb 17, 2023
Closed
iosmanthus pushed a commit to iosmanthus/tidb that referenced this pull request Feb 28, 2023
@ti-chi-bot @iosmanthus
session: fix upgrade (pingcap#40182) (pingcap#41517)
9a573dd 
close pingcap#41502
@xuyifangreeneyes xuyifangreeneyes mentioned this pull request May 25, 2023
Merged
12 tasks
@ti-chi-bot ti-chi-bot mentioned this pull request May 26, 2023
Merged
12 tasks
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

@winoros winoros winoros approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@time-and-fate time-and-fate time-and-fate approved these changes

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees
No one assigned
Labels
release-note-none 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/LGT2 Indicates that a PR has LGTM 2. type/bug-fix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Some upgrade steps are missed
7 participants
@chrysan @ti-chi-bot @XuHuaiyu @hawkingrei @bb7133 @winoros @time-and-fate