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

relay: move dailing upstream and other action out of Init #2227

Merged
merged 8 commits into from
Oct 19, 2021
Merged

relay: move dailing upstream and other action out of Init #2227

merged 8 commits into from
Oct 19, 2021

Conversation

lance6716
Copy link
Collaborator

@lance6716 lance6716 commented Oct 15, 2021 •
edited
Loading

What problem does this PR solve?

close #2203

What is changed and how it works?

as title

Check List

Tests

  • Integration test

Code changes

  • Has exported function/method change
  • Has interface methods change

Side effects

Related changes

  • Need to cherry-pick to the release branch
  • Need to be included in the release note

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 15, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Ehco1996
  • lichunzhu

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.

@Ehco1996 Ehco1996 added this to the v2.1.0 milestone Oct 15, 2021
@lance6716 lance6716 changed the title relay: move dailing upstream out of Init relay: move dailing upstream and other action out of Init Oct 15, 2021
@ti-chi-bot ti-chi-bot added size/L and removed size/M labels Oct 15, 2021
@lance6716 lance6716 added 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 needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated labels Oct 15, 2021
Ehco1996
Ehco1996 reviewed Oct 17, 2021
View reviewed changes
Copy link
Contributor

@Ehco1996 Ehco1996 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

tests/new_relay/run.sh Outdated

# make sure DM-worker doesn't exit
sleep 2
check_rpc_alive $cur/../bin/check_worker_online 127.0.0.1:$WORKER1_PORT
Copy link
Contributor

Choose a reason for hiding this comment

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

seems we don't need this check, because we use query-status which gets the resp from the dm-worker

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

700a0b5

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry, i mean we can remove this sleep 😂

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm afarid DM-worker will response correctly in a short time then triggered exit, so I added a sleep

Ehco1996
Ehco1996 approved these changes Oct 18, 2021
View reviewed changes
Copy link
Contributor

@Ehco1996 Ehco1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 One reviewer already commented LGTM label Oct 18, 2021
lichunzhu
lichunzhu approved these changes Oct 19, 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

@ti-chi-bot ti-chi-bot added status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Oct 19, 2021
@lichunzhu
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 700a0b5

@ti-chi-bot ti-chi-bot merged commit 45e010c into pingcap:master Oct 19, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Oct 19, 2021
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #2243.

ti-chi-bot added a commit that referenced this pull request Oct 20, 2021
@ti-chi-bot
relay: move dailing upstream and other action out of Init (#2227) (#2243
9a82aff 
)
@lance6716 lance6716 mentioned this pull request Nov 9, 2021
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lichunzhu lichunzhu lichunzhu approved these changes

@Ehco1996 Ehco1996 Ehco1996 approved these changes

@GMHDBJD GMHDBJD Awaiting requested review from GMHDBJD

Assignees
No one assigned
Labels
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 needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated size/L status/can-merge status/LGT2 Two reviewers already commented LGTM, ready for merge
Projects
None yet
Milestone
v2.1.0
Development

Successfully merging this pull request may close these issues.

Worker should not offline when enable relay failed
4 participants
@lance6716 @ti-chi-bot @lichunzhu @Ehco1996