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

ddl: set context correctly in the setDDLLabelForDiagnosis (#40090) #40131

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #40090

Signed-off-by: you06 you1474600@gmail.com

What problem does this PR solve?

Issue Number: close #40099

Problem Summary:

There is a fix in #36207, which may mistakely skip the init of context when the job context is not initialized in ddlCtx.setDDLLabelForDiagnosis.

What is changed and how it works?

This PR checks if the context is initialized before setting it, which also avoid the race.

» go test -race ./ddl -run TestAddIndex4
ok      github.com/pingcap/tidb/ddl     19.744s

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

Signed-off-by: you06 <you1474600@gmail.com>

set request source in next calling

Signed-off-by: you06 <you1474600@gmail.com>

more request source check for testing

Signed-off-by: you06 <you1474600@gmail.com>
Signed-off-by: you06 <you1474600@gmail.com>
Signed-off-by: you06 <you1474600@gmail.com>
Signed-off-by: you06 <you1474600@gmail.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Dec 23, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CbcWestwolf
  • cfzjywxk

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. do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Dec 23, 2022
@wuhuizuo
Copy link
Contributor

/hold high priority for trunk branch

@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 10, 2023
@ti-chi-bot
Copy link
Member 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 Feb 10, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Feb 13, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 13, 2023
@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 Feb 13, 2023
@ti-chi-bot
Copy link
Member Author

@CbcWestwolf: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

Use /test all to run all jobs.

In response to this:

/retest build

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.

@CbcWestwolf
Copy link
Member

/test build

@you06
Copy link
Contributor

you06 commented Feb 13, 2023

/hold

There is something strange that needs to be investigated.

@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 13, 2023
@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 14, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Mar 3, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 1, 2023

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

Commit hash: 79d2945

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 1, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jun 5, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
@you06
Copy link
Contributor

you06 commented Aug 16, 2023

/retest

@codecov
Copy link

codecov bot commented Aug 16, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@4d466ba). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #40131   +/-   ##
================================================
  Coverage               ?   77.5849%           
================================================
  Files                  ?       1083           
  Lines                  ?     376252           
  Branches               ?          0           
================================================
  Hits                   ?     291915           
  Misses                 ?      68997           
  Partials               ?      15340           

@you06
Copy link
Contributor

you06 commented Aug 16, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 16, 2023

@you06: We have migrated to builtin LGTM and approve plugins for reviewing.

Please use /approve when you want approve this pull request.

The changes announcement: LGTM plugin changes

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.

@you06
Copy link
Contributor

you06 commented Aug 16, 2023

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Aug 16, 2023
@you06
Copy link
Contributor

you06 commented Aug 16, 2023

/lgtm

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 16, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 17, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CbcWestwolf, cfzjywxk, you06, zyguan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [CbcWestwolf,cfzjywxk,you06,zyguan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 17, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 17, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-16 16:23:04.495364238 +0000 UTC m=+734549.044380224: ☑️ agreed by you06.
  • 2023-08-17 03:05:24.221119506 +0000 UTC m=+773088.770135493: ☑️ agreed by zyguan.

@ti-chi-bot ti-chi-bot bot merged commit 7c1e445 into pingcap:release-6.5 Aug 17, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm 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/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants