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

etcd_worker: add timeout for etcd txn and watchCh (#3667) #3756

Merged
merged 17 commits into from
Dec 20, 2021
Merged

etcd_worker: add timeout for etcd txn and watchCh (#3667) #3756

merged 17 commits into from
Dec 20, 2021

Commits on Dec 7, 2021

  1. This is an automated cherry-pick of pingcap#3667 

    Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
    @asddongmen @ti-chi-bot
    asddongmen authored and ti-chi-bot committed Dec 7, 2021
    Configuration menu
    Copy the full SHA
    bf9ca11 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2021

  1. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 10, 2021
    Configuration menu
    Copy the full SHA
    55296f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0 

    # Conflicts:
#	pkg/orchestrator/etcd_worker.go
    @asddongmen
    asddongmen committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    79b496c View commit details
    Browse the repository at this point in the history

  3. etcd_worker (ticdc): resolves conflict

    @asddongmen
    asddongmen committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    484510e View commit details
    Browse the repository at this point in the history

  4. clock (ticdc): Modify clock to version 1.0.3

    @asddongmen
    asddongmen committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    d7db14e View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. task_test: fix leak test

    @asddongmen
    asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    929488d View commit details
    Browse the repository at this point in the history

  2. etcd_worker: fix it test

    @asddongmen
    asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    9e6fcbf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 13, 2021
    Configuration menu
    Copy the full SHA
    7c2ede7 View commit details
    Browse the repository at this point in the history

  4. etcd_worker: fix missed watch events caused by progress notifications

    @liuzix @asddongmen
    liuzix authored and asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    ef0b839 View commit details
    Browse the repository at this point in the history

  5. code style

    @liuzix @asddongmen
    liuzix authored and asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    cddb0c0 View commit details
    Browse the repository at this point in the history

  6. fix typo

    @liuzix @asddongmen
    liuzix authored and asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    401d802 View commit details
    Browse the repository at this point in the history

  7. add log & fix WatchWithChan

    @liuzix @asddongmen
    liuzix authored and asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    5cb8826 View commit details
    Browse the repository at this point in the history

  8. format

    @liuzix @asddongmen
    liuzix authored and asddongmen committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    7a5adb5 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 14, 2021
    Configuration menu
    Copy the full SHA
    25d743d View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    e274861 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 20, 2021
    Configuration menu
    Copy the full SHA
    2c9a23b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-4.0' into cherry-pick-3667-to-release-4.0

    @asddongmen
    asddongmen authored Dec 20, 2021
    Configuration menu
    Copy the full SHA
    472f94a View commit details
    Browse the repository at this point in the history