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

relay: make relay log high available #1291

Merged
merged 86 commits into from Dec 22, 2020
Merged

relay: make relay log high available #1291

merged 86 commits into from Dec 22, 2020

Conversation

GMHDBJD
Copy link
Collaborator

@GMHDBJD GMHDBJD commented Nov 20, 2020 •
edited

What problem does this PR solve?

close #1234

What is changed and how it works?

  • HA in relay
  • auto resume for relay

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)

GMHDBJD and others added 20 commits November 9, 2020 17:36
@GMHDBJD GMHDBJD added 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 Nov 20, 2020
@GMHDBJD GMHDBJD mentioned this pull request Dec 18, 2020
Merged
7 tasks
lance6716
lance6716 reviewed Dec 21, 2020
View reviewed changes
tests/dmctl_basic/run.sh
pause_relay_success
query_status_stopped_relay
# pause twice won't receive an error now
# pause_relay_fail
Copy link
Collaborator

Choose a reason for hiding this comment

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

did we support pause twice now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

pause twice won't receive an error

relay/relay.go Outdated Show resolved Hide resolved
@lance6716
Copy link
Collaborator

LGTM

@ti-srebot ti-srebot added the status/LGT1 One reviewer already commented LGTM label Dec 21, 2020
GMHDBJD
GMHDBJD commented Dec 21, 2020
View reviewed changes
dm/worker/server.go
} else {
// set UUIDSuffix even not checkpoint exist
// so we will still remove relay dir
cfg.UUIDSuffix = binlog.MinUUIDSuffix
Copy link
Collaborator Author

@GMHDBJD GMHDBJD Dec 21, 2020 •
edited

Choose a reason for hiding this comment

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

add in 41ef863 and 61fb37b, PTAL

csuzhangxc
csuzhangxc approved these changes Dec 22, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@csuzhangxc csuzhangxc added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Dec 22, 2020
@csuzhangxc csuzhangxc merged commit 9ee34dc into pingcap:master Dec 22, 2020
ti-srebot pushed a commit to ti-srebot/dm that referenced this pull request Dec 22, 2020
@GMHDBJD @ti-srebot
cherry pick pingcap#1291 to release-2.0
97527c6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 22, 2020
Merged
2 tasks
@ti-srebot
Copy link

cherry pick to release-2.0 in PR #1353

@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 Dec 22, 2020
csuzhangxc pushed a commit that referenced this pull request Dec 22, 2020
@ti-srebot @GMHDBJD
relay: make relay log high available (#1291) (#1353)
c8a2a89 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: GMHDBJD <35025882+GMHDBJD@users.noreply.github.com>
@GMHDBJD GMHDBJD mentioned this pull request Dec 24, 2020
Merged
@ti-srebot ti-srebot mentioned this pull request Dec 25, 2020
Merged
7 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lance6716 lance6716 lance6716 left review comments

@csuzhangxc csuzhangxc csuzhangxc 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 status/LGT2 Two reviewers already commented LGTM, ready for merge status/PTAL This PR is ready for review. Add this label back after committing new changes
Projects
None yet
Milestone
v2.0.1
Development

Successfully merging this pull request may close these issues.

Bring relay support back in v2.0
4 participants
@GMHDBJD @lance6716 @ti-srebot @csuzhangxc