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.

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

test(dm): fix using pgrep to check argument pattern (#6572) #6585

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6572

Signed-off-by: lance6716 [email protected]

What problem does this PR solve?

Issue Number: close #6526, close #5731, close #5287

What is changed and how it works?

  • we use kill_process dm-worker1 in test script, and finally it will become pgrep dm-worker1. This is not right because dm-worker1 is in arguments and pgrep only check process name.
  • old problems, same root cause but different case as flaking test ALTER TABLE shardddl.tb ADD COLUMN new_col1 INT DEFAULT -1 #5807
  • after syncer processes RowsEvent, check_sync_diff will pass, but XIDEvent may have not been written to relay log. We retry checking for 5 seconds.

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)
# lance @ lance6716-nuc10i7fnh in ~/go/src/github.com/pingcap/tiflow on git:master o [14:31:49] 
$ pgrep -f dm-worker1     
467807

# lance @ lance6716-nuc10i7fnh in ~/go/src/github.com/pingcap/tiflow on git:master x [14:32:09] 
$ pgrep dm-worker1                                       

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note

 `None`.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 the release-note-none Denotes a PR that doesn't merit a release note. label Aug 3, 2022
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. labels Aug 3, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Aug 4, 2022
@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 99408aa

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 4, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Aug 5, 2022
@lance6716
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: dd24db3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 5, 2022
@lance6716
Copy link
Contributor

/merge

@ti-chi-bot ti-chi-bot merged commit a56c39c into pingcap:release-5.4 Aug 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants