Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

cherry-pick #247 to 3.1 #303

Merged
merged 6 commits into from
May 25, 2020
Merged

Conversation

YuJuncen
Copy link
Collaborator

@YuJuncen YuJuncen commented May 22, 2020

What problem does this PR solve?

cherry-pick #247 to 3.1 manually.

Release Note

  • fix the problem that might cause: when restoring many small tables, br failed on error NotLeader.

YuJuncen and others added 6 commits May 22, 2020 16:59
… client.* restore: don't fail when RegionError has no leader* restore: use findLeaderErr instead of splitErrors* *: use go.uber.org/multierr instead of coreos/multierror.* restore: add failpoint tests on retry.* *: make linter happy.* *: remove probabilistic, and disable failpoint anyway.* restore: add test on generic retryable error.* *: fix CI.* restore: use failpoint to inject leader.* *: enable failpoint in testcover.* *: accept some advise from @kenny.* *: add a test point.* Update pkg/restore/split_client.goCo-authored-by: kennytm <[email protected]>* restore: apply suggestions.* Merge branch 'master' of https://github.com/pingcap/br into retry-split-master* go.mod: fix version of failpoint.* restore: remove some retry on batcher.Co-authored-by: kennytm <[email protected]>
Copy link
Collaborator

@kennytm kennytm left a comment

Choose a reason for hiding this comment

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

LGTM

@YuJuncen
Copy link
Collaborator Author

Meet many [ERROR] [client.go:259] ["[pd] getTS error"] [error="rpc error: code = Unknown desc = alloc timestamp failed, lease expired"]... Maybe wrong version of client used?

@YuJuncen
Copy link
Collaborator Author

/run-integration-test

1 similar comment
@YuJuncen
Copy link
Collaborator Author

/run-integration-test

@kennytm
Copy link
Collaborator

kennytm commented May 25, 2020

PTAL @overvenus

@overvenus overvenus merged commit ae64465 into pingcap:release-3.1 May 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants