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

sorter: fix unified sorter magic numbers & reduce memory consumption by channels (#1915) #1958

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1915

What problem does this PR solve?

  • Unexpectedly large memory consumption by Unified Sorter when tables are many.
  • Too many magic numbers in Unified Sorter.

What is changed and how it works?

  • Reduce heapSorter inputCh size
  • Add constants for some magic numbers used for sizes to better manage these sizes.

Check List

Tests

  • Unit test
  • Integration test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Fix Unified Sorter memory consumption when tables are many.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-5.0 This PR is cherry-picked to release-5.0 from a source PR. labels Jun 6, 2021
@amyangfei amyangfei added this to the v5.0.3 milestone Jun 6, 2021
@liuzix
Copy link
Contributor

liuzix commented Jun 6, 2021

/run-all-tests

1 similar comment
@liuzix
Copy link
Contributor

liuzix commented Jun 7, 2021

/run-all-tests

@codecov-commenter
Copy link

codecov-commenter commented Jun 7, 2021

Codecov Report

❗ No coverage uploaded for pull request base (release-5.0@8bab5db). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release-5.0      #1958   +/-   ##
================================================
  Coverage               ?   54.0649%           
================================================
  Files                  ?        164           
  Lines                  ?      17540           
  Branches               ?          0           
================================================
  Hits                   ?       9483           
  Misses                 ?       7062           
  Partials               ?        995           

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 7, 2021
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • overvenus

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 Indicates that a PR has LGTM 2. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 7, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 21, 2021
@liuzix
Copy link
Contributor

liuzix commented Jun 21, 2021

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 9b14b0b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 21, 2021
@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 22, 2021
@amyangfei
Copy link
Contributor

/merge

@amyangfei
Copy link
Contributor

[2021-06-22T06:55:59.379Z] ----------------------------------------------------------------------

[2021-06-22T06:55:59.379Z] FAIL: config_test.go:81: serverConfigSuite.TestMarshal

[2021-06-22T06:55:59.379Z] 

[2021-06-22T06:55:59.379Z] config_test.go:89:

[2021-06-22T06:55:59.379Z]     c.Assert(b, check.Equals, `{"addr":"192.155.22.33:8887","advertise-addr":"","log-file":"","log-level":"info","gc-ttl":86400,"tz":"System","capture-session-ttl":10,"owner-flush-interval":200000000,"processor-flush-interval":100000000,"sorter":{"num-concurrent-worker":4,"chunk-size-limit":999,"max-memory-percentage":80,"max-memory-consumption":8589934592,"num-workerpool-goroutine":16,"sort-dir":"/tmp/cdc_sort"},"security":{"ca-path":"","cert-path":"","key-path":"","cert-allowed-cn":null},"per-table-memory-quota":20971520,"kv-client":{"worker-concurrent":8,"worker-pool-size":0}}`)

[2021-06-22T06:55:59.379Z] ... obtained string = "{\"addr\":\"192.155.22.33:8887\",\"advertise-addr\":\"\",\"log-file\":\"\",\"log-level\":\"info\",\"gc-ttl\":86400,\"tz\":\"System\",\"capture-session-ttl\":10,\"owner-flush-interval\":200000000,\"processor-flush-interval\":100000000,\"sorter\":{\"num-concurrent-worker\":4,\"chunk-size-limit\":999,\"max-memory-percentage\":30,\"max-memory-consumption\":17179869184,\"num-workerpool-goroutine\":16,\"sort-dir\":\"/tmp/cdc_sort\"},\"security\":{\"ca-path\":\"\",\"cert-path\":\"\",\"key-path\":\"\",\"cert-allowed-cn\":null},\"per-table-memory-quota\":20971520,\"kv-client\":{\"worker-concurrent\":8,\"worker-pool-size\":0}}"

[2021-06-22T06:55:59.380Z] ... expected string = "{\"addr\":\"192.155.22.33:8887\",\"advertise-addr\":\"\",\"log-file\":\"\",\"log-level\":\"info\",\"gc-ttl\":86400,\"tz\":\"System\",\"capture-session-ttl\":10,\"owner-flush-interval\":200000000,\"processor-flush-interval\":100000000,\"sorter\":{\"num-concurrent-worker\":4,\"chunk-size-limit\":999,\"max-memory-percentage\":80,\"max-memory-consumption\":8589934592,\"num-workerpool-goroutine\":16,\"sort-dir\":\"/tmp/cdc_sort\"},\"security\":{\"ca-path\":\"\",\"cert-path\":\"\",\"key-path\":\"\",\"cert-allowed-cn\":null},\"per-table-memory-quota\":20971520,\"kv-client\":{\"worker-concurrent\":8,\"worker-pool-size\":0}}"

[2021-06-22T06:55:59.380Z] 

[2021-06-22T06:55:59.380Z] OOPS: 5 passed, 1 FAILED

[2021-06-22T06:55:59.380Z] --- FAIL: Test (0.01s)

[2021-06-22T06:55:59.380Z] FAIL

[2021-06-22T06:55:59.380Z] coverage: 64.5% of statements

[2021-06-22T06:55:59.380Z] FAIL	github.com/pingcap/ticdc/pkg/config	0.047s

PTAL @liuzix

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Jun 22, 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: 85c4df4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 22, 2021
@ti-chi-bot ti-chi-bot merged commit a8a2dce into pingcap:release-5.0 Jun 22, 2021
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. 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.0 This PR is cherry-picked to release-5.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants