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

.*: fix etcd txn limit for lots of sources (#1852) #1868

Merged
merged 7 commits into from
Jul 14, 2021
Merged

.*: fix etcd txn limit for lots of sources (#1852) #1868

merged 7 commits into from
Jul 14, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1852

What problem does this PR solve?

close #1835 #1804

What is changed and how it works?

  • increase etcd max-txn-ops to 2048
  • expose max-txn-ops and MaxRequestBytes config
  • fix watch goroutine leak, which causes master OOM if upgrade failed.

Check List

Tests

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

@ti-chi-bot ti-chi-bot mentioned this pull request Jul 14, 2021
Merged
@ti-chi-bot ti-chi-bot added needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated needs-update-release-note This PR should be added into release notes. Remove this label once the release notes are updated size/L status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick-for-release-2.0 labels Jul 14, 2021
@ti-chi-bot ti-chi-bot requested a review from GMHDBJD July 14, 2021 04:48
GMHDBJD
GMHDBJD approved these changes Jul 14, 2021
View reviewed changes
Copy link
Collaborator

@GMHDBJD GMHDBJD 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 Jul 14, 2021
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • lance6716

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 status/LGT2 Two reviewers already commented LGTM, ready for merge and removed status/LGT1 One reviewer already commented LGTM labels Jul 14, 2021
@lance6716
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: df2c6b3

@ti-chi-bot ti-chi-bot merged commit 78b3721 into pingcap:release-2.0 Jul 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@lance6716 lance6716 lance6716 approved these changes

@lichunzhu lichunzhu Awaiting requested review from lichunzhu

Assignees

@GMHDBJD GMHDBJD

Labels
needs-update-docs Should update docs after this PR is merged. Remove this label once the docs are updated 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 status/PTAL This PR is ready for review. Add this label back after committing new changes type/bug-fix Bug fix type/cherry-pick-for-release-2.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ti-chi-bot @lance6716 @GMHDBJD