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.

Sign up for GitHub

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

Jump to bottom

sink(ticdc): Revert changes related to the conflict detector #10923

Merged
merged 1 commit into from
Apr 19, 2024
Merged

sink(ticdc): Revert changes related to the conflict detector #10923

merged 1 commit into from
Apr 19, 2024

Conversation

CharlesCheung96
Copy link
Contributor

@CharlesCheung96 CharlesCheung96 commented Apr 18, 2024 •
edited by flowbehappy
Loading

What problem does this PR solve?

Issue Number: close #10341

What is changed and how it works?

Check List

Tests

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

Questions

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

Release note 

Please refer to [Release Notes Language Style Guide](https://pingcap.github.io/tidb-dev-guide/contribute-to-tidb/release-notes-style-guide.html) to write a quality release note.

If you don't think this PR needs a release note then fill it with `None`.

@ti-chi-bot ti-chi-bot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Apr 18, 2024
@CharlesCheung96 CharlesCheung96 changed the base branch from release-7.5 to release-7.1 April 18, 2024 08:35
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 18, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 18, 2024

@hongyunyan: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 18, 2024

@lidezhu: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 18, 2024
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Apr 18, 2024
@CharlesCheung96
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 18, 2024
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Apr 18, 2024
@CharlesCheung96
Copy link
Contributor Author

/retest

1 similar comment
@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96
Copy link
Contributor Author

/test cdc-integration-pulsar-test

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 18, 2024

@CharlesCheung96: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test cdc-integration-kafka-test
  • /test cdc-integration-mysql-test
  • /test cdc-integration-storage-test
  • /test dm-compatibility-test
  • /test dm-integration-test
  • /test engine-integration-test
  • /test verify

Use /test all to run all jobs.

In response to this:

/test cdc-integration-pulsar-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 18, 2024
@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96 CharlesCheung96 force-pushed the revert-conflict-related-pr-71 branch from 2b5125e to 10ce74f Compare April 18, 2024 11:35
@CharlesCheung96
Copy link
Contributor Author

/test all

@CharlesCheung96
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 19, 2024 •
edited
Loading

@CharlesCheung96: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cdc-integration-pulsar-test 2b5125e link true /test cdc-integration-pulsar-test

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@CharlesCheung96
Copy link
Contributor Author

/retest

@CharlesCheung96
Copy link
Contributor Author

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 19, 2024
@CharlesCheung96 CharlesCheung96 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 19, 2024
@CharlesCheung96 CharlesCheung96 mentioned this pull request Apr 19, 2024
Closed
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Apr 19, 2024
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 19, 2024
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 19, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-04-19 03:23:46.990506172 +0000 UTC m=+567646.101552620: ☑️ agreed by asddongmen.
  • 2024-04-19 03:26:42.962537349 +0000 UTC m=+567822.073583797: ☑️ agreed by 3AceShowHand.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3AceShowHand, asddongmen, hongyunyan, lidezhu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [3AceShowHand,asddongmen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot merged commit 1b84fc6 into pingcap:release-7.1 Apr 19, 2024
11 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3AceShowHand 3AceShowHand 3AceShowHand approved these changes

@asddongmen asddongmen asddongmen approved these changes

@hongyunyan hongyunyan hongyunyan approved these changes

@lidezhu lidezhu lidezhu approved these changes

Assignees
No one assigned
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@CharlesCheung96 @3AceShowHand @asddongmen @hongyunyan @lidezhu @ti-chi-bot