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

BR: update br keep upstream #26972

Merged
merged 21 commits into from
Aug 8, 2021
Merged

BR: update br keep upstream #26972

merged 21 commits into from
Aug 8, 2021

Conversation

3pointer
Copy link
Contributor

@3pointer 3pointer commented Aug 6, 2021

What problem does this PR solve?

Problem Summary:

update br to latest with subtree upstream

What is changed and how it works?

Proposal: xxx

What's Changed:

Check List

Tests

  • Unit test
  • Integration test

Release note 

None

@3pointer
Merge commit 'f5053bc8f0b9594cdd5d45a7de8f110399eac49c' as 'br'
1778c1a
@3pointer
Squashed 'br/' content from commit cf621d7c0
f5053bc 
git-subtree-dir: br
git-subtree-split: cf621d7c0c5eb5cc5d6a42816f84fd2aabb55bfc
@3pointer
change the import path of br cmd/pkg
4ef36b2
@3pointer
change the failpoint path of br/tests
b16b84e
@3pointer
change the import path of br/web br/tools
93b4d7e
@3pointer
change the import path of tidb
82730e7
@3pointer
remove cycle depenence in go.mod
b565916
@3pointer
update Makefile
25fb118
@3pointer
change the import path after subtree update
aa686b9
@3pointer
update go mod after merge master
968283d
@3pointer
fix the issue that check failed after subtree update to master
bac916f
@3pointer
remove extra space in MakeFile
d6b0cdc
@3pointer
reorder the imports pkg in br
5ac2d5a
@3pointer
update go.mod after rebase master && kvproto updated
ba848c2
@3pointer
reorder go imports by tidb requirements
fe28074
@3pointer
br: reduce sleep seconds for unit test
389b4e1
@3pointer
Merge branch 'master' into br_keep_upstream
b32ce9b
@3pointer
Squashed 'br/' changes from cf621d7c0..3b1308e89
cc25ce9 
3b1308e89 lightning: evaluate all generated columns even if they are virtual (pingcap#1407)
1b0e54c2f lightning: check and restore pd scheduler even if our task failed (pingcap#1336)
073d3596c lightning: fix the bug that calculate unfinished ranges may miss some range (pingcap#1413)
82ff927df backup: refine backup log for tracing backup tasks (pingcap#1335)
e907562e8 lightning: make create table ddl compatible with clustered index (pingcap#1364)
b6cab4b27 lightning: auto configure for parallel import (pingcap#1387)

git-subtree-dir: br
git-subtree-split: 3b1308e89de39325c3f0aa8931aebdf56db663f2
@3pointer
Merge commit 'cc25ce9f3fbc6971e757b2c4c856827144477784' into br_keep_…
ac0327c 
…upstream
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 6, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • glorv

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 6, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 6, 2021
@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 Aug 6, 2021
@kennytm
Copy link
Contributor

kennytm commented Aug 8, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: ac0327c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 8, 2021
@ti-chi-bot ti-chi-bot merged commit a7fdc2a into pingcap:master Aug 8, 2021
@ti-srebot ti-srebot mentioned this pull request Aug 9, 2021
Merged
2 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #27003

@you06 you06 mentioned this pull request Aug 17, 2021
Closed
you06
you06 reviewed Aug 17, 2021
View reviewed changes
br/pkg/pdutil/pd.go
@@ -26,13 +26,15 @@ import (
"github.com/pingcap/tidb/br/pkg/lightning/common"
"github.com/pingcap/tidb/util/codec"
pd "github.com/tikv/pd/client"
pdapi "github.com/tikv/pd/server/api"
Copy link
Contributor

@you06 you06 Aug 17, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Directly import PD components leads to flag pollution. PD import github.com/pingcap/check which sets check.v flag in some packages(not test package), however, TiDB is highly depend on the flags when bootstrapping variables(test and prod env has different variables).

More details can be found #27156 (comment).

3pointer added a commit to ti-srebot/tidb that referenced this pull request Aug 18, 2021
@3pointer
cherry pick pingcap#26972 to release-5.2
a648667 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-chi-bot pushed a commit that referenced this pull request Aug 18, 2021
@ti-srebot
BR: update br keep upstream (#26972) (#27003)
e08a790
joccau pushed a commit to joccau/tidb that referenced this pull request Sep 7, 2021
@3pointer
BR: update br keep upstream (pingcap#26972)
cdfe4e7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@you06 you06 you06 left review comments

@glorv glorv glorv approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.2 release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@3pointer @ti-chi-bot @kennytm @ti-srebot @glorv @you06 @YuJuncen @zhouqiang-cl