cdc/sorter: make unified sorter cgroup aware #3436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It fixes an OOM issue where memory limited by cgroup is smaller than physical memory. Note this patch only recognizes container cgroup, it may still OOM when the cgroup is set by systemd or manually. Signed-off-by: Neil Shen <overvenus@gmail.com>
overvenus
added
type/bugfix
overvenus
requested review from
amyangfei,
ben1009,
zhaoxinyu,
3AceShowHand and
liuzix
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
ti-chi-bot
added
release-note
2 tasks
amyangfei
reviewed
Nov 12, 2021
cdc/sorter/unified/backend_pool.go
Outdated
Comment on lines
102
to
107
| // TODO: The underlaying implementation only recognizes cgroups set by | ||
| // containers, we need to support cgroups set by systemd or manually. | ||
| totalMemory, err := memory.MemTotal() | ||
| if err != nil { | ||
| log.Panic("read memory stat failed", zap.Error(err)) | ||
| } |
There was a problem hiding this comment.
I notice there is no unit test for MemTotal and MemUsed in github.com/pingcap/tidb/util/memory, can we add a unit test in github action to verify it works.
There was a problem hiding this comment.
I think its hard to add unit tests, the best effort we can do is to verify if github.com/pingcap/tidb/util/memory parses cgroup info correctly, and it should be added in upstream not here.
Also, we plan to support cgroups set by systemd in a later PR, at that time, we can add unit tests.
overvenus
commented
Nov 12, 2021
amyangfei
approved these changes
Nov 12, 2021
3AceShowHand
approved these changes
Nov 12, 2021
ti-chi-bot
added
status/LGT2
liuzix
approved these changes
Nov 12, 2021
|
/run-integration-tests |
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: cae5346
|
|
/unhold |
ti-chi-bot
removed
the
do-not-merge/hold
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 27c3938
|
ti-chi-bot
added
the
status/can-merge
|
/run-integration-tests |
ti-chi-bot
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Nov 12, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
In response to a cherrypick label: new pull request created: #3437. |
ti-chi-bot
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Nov 12, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
In response to a cherrypick label: new pull request created: #3438. |
ti-chi-bot
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Nov 12, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
In response to a cherrypick label: new pull request created: #3439. |
ti-chi-bot
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Nov 12, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
In response to a cherrypick label: new pull request created: #3440. |
ti-chi-bot
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Nov 12, 2021
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
|
In response to a cherrypick label: new pull request created: #3441. |
ti-chi-bot
added a commit
that referenced
this pull request
Nov 16, 2021
ti-chi-bot
added a commit
that referenced
this pull request
Nov 16, 2021
ti-chi-bot
added a commit
that referenced
this pull request
Nov 16, 2021
ti-chi-bot
added a commit
that referenced
this pull request
Nov 16, 2021
3 tasks
ti-chi-bot
added a commit
that referenced
this pull request
Dec 17, 2021
3AceShowHand
pushed a commit
to ti-chi-bot/tiflow
that referenced
this pull request
Jan 13, 2022
overvenus
pushed a commit
that referenced
this pull request
Jan 18, 2022
* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ * address comments * add comments for exported functions * fix the compiling problem * workerpool: limit the rate to output deadlock warning (#3775) (#3795) * tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741) * relay(dm): use binlog name comparison (#3710) (#3712) * dm/load: fix concurrent call Loader.Status (#3459) (#3468) * cdc/sorter: make unified sorter cgroup aware (#3436) (#3439) * tz (ticdc): fix timezone error (#3887) (#3906) * pkg,cdc: do not use log package (#3902) (#3940) * *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959) * http_*: add log for http api and refine the err handle logic (#2997) (#3307) * etcd_worker: batch etcd patch (#3277) (#3389) * http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882) * kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663) * owner: fix owner tick block http request (#3490) (#3530) * dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256) * dep(dm): update go-mysql (#3914) (#3934) * dm/syncer: multiple rows use downstream schema (#3308) (#3953) * errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995) * dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005) * syncer(dm): use an early location to reset binlog and open safemode (#3860) * ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978) * dm/scheduler: fix inconsistent of relay status (#3474) (#4009) * owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016) * config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783) * sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083) * master(dm): clean and treat invalid load task (#4004) (#4145) * loader: fix wrong progress in query-status for loader (#4093) (#4143) close #3252 * ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028) * dm: load table structure from dump files (#3295) (#4163) * compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088) * kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111) close #4006 * metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104) * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * retry(dm): align with tidb latest error message (#4172) (#4254) close #4159, close #4246 * owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865) * redolog: add a precleanup process when s3 enable (#3525) (#3878) * ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227) close #4173 * cdc/sink: remove Initialize method from the sink interface (#3682) (#3765) Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com> * http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123) close #3840 * sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099) close #4055 * cdc/sink: adjust kafka initialization logic (#3192) (#4162) * try fix conflicts. * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io> * fix conflicts. * fix conflicts. Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com> Co-authored-by: amyangfei <yangfei@pingcap.com> Co-authored-by: lance6716 <lance6716@gmail.com> Co-authored-by: sdojjy <sdojjy@qq.com> Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com> Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
It fixes an OOM issue where memory limited by cgroup is smaller
than physical memory.
Note this patch only recognizes container cgroup, it may still
OOM when the cgroup is set by systemd or manually.
Cc https://github.com/pingcap/ticdc/issues/1798
Check List
Tests
--sink-uri="mysql://xx:xx@MYSQLIP:3306/" -c "mysql37"
--start-ts=$(( $(pd-ctl -u http://PDIP service-gc-safepoint | jq '.service_gc_safe_points[] | select(.service_id == "gc_worker") | .safe_point') + 1000 ))
--no-confirm --sort-engine=unified
OOM log in demsg
Left: master
Right: this PR
Related changes
Release note