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

sorter: Unified Sorter clean up stale temporary files (#1663) #1741

Merged
merged 12 commits into from
May 12, 2021
Merged

sorter: Unified Sorter clean up stale temporary files (#1663) #1741

merged 12 commits into from
May 12, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1663

What problem does this PR solve?

  • Unified Sorter is not able to clean up its temporary files if the process exits abnormally. If the process OOMs frequently, disk space can be exhausted and will require a manual clean-up.

What is changed and how it works?

  • File lock-based stale file detection and clean up.
  • Prevents multiple cdc server instances from sharing the same sort-dir.

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has persistent data change

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to modify TiDB operator to make TiCDC a stateful set.

Release note

  • Add stale temporary files clean-up in Unified Sorter, and forbids sharing sort-dir.

@ti-chi-bot ti-chi-bot added component/puller Puller component. status/ptal Could you please take a look? size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels May 8, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request May 8, 2021
Merged
@ti-chi-bot ti-chi-bot requested a review from zier-one May 8, 2021 06:41
@ti-chi-bot ti-chi-bot requested a review from lance6716 May 8, 2021 06:41
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 9, 2021
@amyangfei amyangfei force-pushed the cherry-pick-1663-to-release-4.0 branch from f77b9a0 to fa4b745 Compare May 10, 2021 06:19
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 10, 2021
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei amyangfei added this to the v4.0.13 milestone May 10, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 10, 2021
@zier-one
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • leoppro

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 11, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label May 11, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: fa4b745

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 11, 2021
@amyangfei
Copy link
Contributor

Should we turn on unified sorter from v4.0.13

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2021
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 7891da3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2021
@amyangfei
Copy link
Contributor

/run-all-tests

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2021
@liuzix
Copy link
Contributor

liuzix commented May 12, 2021

/run-all-tests

@liuzix
Copy link
Contributor

liuzix commented May 12, 2021

/run-all-tests

@codecov-commenter
Copy link

Codecov Report

Merging #1741 (b450fc5) into release-4.0 (753073a) will decrease coverage by 1.2859%.
The diff coverage is 52.7570%.

@@                 Coverage Diff                 @@
##           release-4.0      #1741        +/-   ##
===================================================
- Coverage      53.7661%   52.4802%   -1.2860%     
===================================================
  Files              153        153                
  Lines            15958      15926        -32     
===================================================
- Hits              8580       8358       -222     
- Misses            6475       6659       +184     
- Partials           903        909         +6

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: b450fc5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 12, 2021
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@liuzix
Copy link
Contributor

liuzix commented May 12, 2021

/merge

@amyangfei
Copy link
Contributor

/run-leak-tests

@amyangfei
Copy link
Contributor

/run-all-tests

1 similar comment
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit 8cfe19c into pingcap:release-4.0 May 12, 2021
@3pointer 3pointer mentioned this pull request May 21, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei approved these changes

@zier-one zier-one Awaiting requested review from zier-one

@lance6716 lance6716 Awaiting requested review from lance6716

Assignees

@liuzix liuzix

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/puller Puller component. size/XXL Denotes a PR that changes 1000+ 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. status/ptal Could you please take a look? type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Milestone
v4.0.13
Development

Successfully merging this pull request may close these issues.
6 participants
@ti-chi-bot @amyangfei @zier-one @liuzix @codecov-commenter @zhouqiang-cl