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

auto master-slave switch #1364

Merged
merged 35 commits into from
Feb 3, 2021
Merged

auto master-slave switch #1364

merged 35 commits into from
Feb 3, 2021

Conversation

GMHDBJD
Copy link
Collaborator

@GMHDBJD GMHDBJD commented Dec 28, 2020 •
edited by lance6716
Loading

What problem does this PR solve?

  • syncer auto switch relay subdir when master-slave switch
  • auto test master-slave switch
  • auto detect master-slave switch

Tests

  • Unit test
  • github action

@GMHDBJD GMHDBJD added priority/normal Minor change, requires approval from ≥1 primary reviewer status/WIP This PR is still work in progress needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Dec 28, 2020
@GMHDBJD
Copy link
Collaborator Author

GMHDBJD commented Dec 31, 2020

/run-all-tests

lance6716
lance6716 reviewed Jan 6, 2021
View reviewed changes
pkg/streamer/reader.go
select {
case <-ctx.Done():
return false, false, 0, "", "", nil
case switchResp := <-switchCh:
Copy link
Collaborator

Choose a reason for hiding this comment

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

will relay break-then-autoresume, so generated a new subdirectory. meanwhile old subdirectory has updated something before break, so in this select can't assure priority?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

add a check in 20f40cd

lance6716
lance6716 reviewed Jan 6, 2021
View reviewed changes
Copy link
Collaborator

@lance6716 lance6716 left a comment

Choose a reason for hiding this comment

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

rest LGTM

@lance6716
Copy link
Collaborator

LGTM

@ti-srebot ti-srebot added the status/LGT1 One reviewer already commented LGTM label Jan 6, 2021
@lance6716 lance6716 mentioned this pull request Jan 11, 2021
Open
22 tasks
@GMHDBJD GMHDBJD added this to the v2.0.2 milestone Jan 19, 2021
@lance6716
Copy link
Collaborator

PTAL @3pointer @amyangfei

lichunzhu
lichunzhu reviewed Feb 2, 2021
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

Rest LGTM

pkg/terror/error_list.go Outdated Show resolved Hide resolved
lance6716 and others added 2 commits February 2, 2021 19:03
@lance6716 @lichunzhu
Update pkg/terror/error_list.go
76ddfed 
Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>
@lance6716
Merge branch 'master' into switchNextDir
a5a543c
@lance6716

This comment has been minimized.

Sign in to view
lance6716
lance6716 reviewed Feb 3, 2021
View reviewed changes
errors.toml Outdated Show resolved Hide resolved
_utils/terror_gen/errors_release.txt Outdated Show resolved Hide resolved
@lance6716
Copy link
Collaborator

required CI passed, PTAL @lichunzhu

lichunzhu
lichunzhu approved these changes Feb 3, 2021
View reviewed changes
Copy link
Contributor

@lichunzhu lichunzhu left a comment

Choose a reason for hiding this comment

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

LGTM

@lance6716 lance6716 merged commit b04afa7 into pingcap:master Feb 3, 2021
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Feb 3, 2021
@GMHDBJD @ti-srebot
cherry pick pingcap#1364 to release-2.0
c82ba8c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Feb 3, 2021
Merged
3 tasks
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1420

@ti-srebot ti-srebot added already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked and removed needs-cherry-pick-release-2.0 This PR should be cherry-picked to release-2.0. Remove this label after cherry-picked to release-2.0 labels Feb 3, 2021
lance6716 added a commit to lance6716/dm that referenced this pull request Feb 3, 2021
@lance6716
streamer: fix unstable Ci introduced in pingcap#1364
783d34b
@lance6716 lance6716 mentioned this pull request Feb 3, 2021
Merged
lance6716 added a commit that referenced this pull request Feb 3, 2021
@lance6716
streamer: fix unstable Ci introduced in #1364 (#1421)
6405554
lance6716 added a commit to ti-srebot/dm that referenced this pull request Feb 3, 2021
@lance6716
streamer: fix unstable Ci introduced in pingcap#1364 (pingcap#1421)
ddea396
lance6716 pushed a commit that referenced this pull request Feb 3, 2021
@ti-srebot
auto master-slave switch (#1364) (#1420)
2327f76
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lance6716 lance6716 lance6716 left review comments

@lichunzhu lichunzhu lichunzhu approved these changes

Assignees
No one assigned
Labels
already-cherry-pick-2.0 The related PR is already cherry-picked to release-2.0. Add this label once the PR is cherry-picked priority/normal Minor change, requires approval from ≥1 primary reviewer status/LGT1 One reviewer already commented LGTM status/PTAL This PR is ready for review. Add this label back after committing new changes
Projects
None yet
Milestone
v2.0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@GMHDBJD @lance6716 @ti-srebot @lichunzhu