merge upstream tidb-7.5 #1370
Merged
merge upstream tidb-7.5 #1370
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
) (tikv#1151) * resource_control: add ru details in ExecDetails (tikv#1070) * collecting the RU information by pasing point through context.Value (tikv#1032) Signed-off-by: zzm <[email protected]> * add ruWaitDuration to RUDetails and update pd-client Signed-off-by: glorv <[email protected]> --------- Signed-off-by: zzm <[email protected]> Signed-off-by: glorv <[email protected]> Co-authored-by: zzm <[email protected]> * use latest pd-client of release-7.5 Signed-off-by: nolouch <[email protected]> --------- Signed-off-by: zzm <[email protected]> Signed-off-by: glorv <[email protected]> Signed-off-by: nolouch <[email protected]> Co-authored-by: glorv <[email protected]> Co-authored-by: zzm <[email protected]>
Signed-off-by: glorv <[email protected]> Co-authored-by: glorv <[email protected]>
* feat: check kill signal in 2pc committer (tikv#1084) Signed-off-by: ekexium <[email protected]> Co-authored-by: disksing <[email protected]> * ErrQueryInterrupted with parameters (tikv#1124) * feat: ErrQueryInterrupted with parameters Signed-off-by: ekexium <[email protected]> * Revert "Revert "fix: check kill signal against 0 (tikv#1102)" (tikv#1129)" This reverts commit 3480b5e. Signed-off-by: ekexium <[email protected]> --------- Signed-off-by: ekexium <[email protected]> Co-authored-by: cfzjywxk <[email protected]> --------- Signed-off-by: ekexium <[email protected]> Co-authored-by: disksing <[email protected]> Co-authored-by: cfzjywxk <[email protected]>
…lt value (tikv#1244) Signed-off-by: gengliqi <[email protected]>
Signed-off-by: zyguan <[email protected]>
Signed-off-by: zyguan <[email protected]>
Signed-off-by: xufei <[email protected]>
Signed-off-by: zyguan <[email protected]>
* tikvrpc: avoid data race on `XxxRequest.Context` * fix grammar of codegen comment * address comments * check diff of go generate * fix a typo --------- Signed-off-by: zyguan <[email protected]>
* fix rpc client panic cause by concurrent close Signed-off-by: crazycs520 <[email protected]> * refine Signed-off-by: crazycs520 <[email protected]> --------- Signed-off-by: crazycs520 <[email protected]>
…merge-upstream-7.5 Signed-off-by: iosmanthus <[email protected]>
Signed-off-by: iosmanthus <[email protected]>
Signed-off-by: iosmanthus <[email protected]>
Signed-off-by: iosmanthus <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.