*: support cgroup with systemd #48096

hawkingrei · 2023-10-30T08:53:51Z

What problem does this PR solve?

Issue Number: close #47442

Problem Summary:

What is changed and how it works?

Check List

Tests

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

1、with systemd

run tidb-server

[Unit]
Description=tidb

[Service]
Type=simple
Restart=always
ExecStart=/usr/bin/tidb
StandardOutput=journal
MemoryMax=500M

[Install]
WantedBy=multi-user.target

you will see the log like this.

 [2023/10/30 11:00:49.325 +00:00] [INFO] [meminfo.go:188] ["use cgroup memory hook"] [cgroupMemorySize=524288000] [physicalMemorySize=32900468736]

2、without systemd

you will see.

[2023/10/30 10:47:16.154 +00:00] [INFO] [meminfo.go:190] ["use physical memory hook"] [cgroupMemorySize=9223372036854775807] [physicalMemorySize=32900468736]

No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

*: support cgroup with systemd

Signed-off-by: Weizhen Wang <[email protected]>

codecov · 2023-10-30T09:04:52Z

Codecov Report

Merging #48096 (b41b1f0) into master (f9f6bb3) will increase coverage by 1.3210%.
Report is 18 commits behind head on master.
The diff coverage is 18.5185%.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #48096        +/-   ##
================================================
+ Coverage   71.5801%   72.9011%   +1.3210%     
================================================
  Files          1401       1423        +22     
  Lines        405938     413328      +7390     
================================================
+ Hits         290571     301321     +10750     
+ Misses        95569      93120      -2449     
+ Partials      19798      18887       -911

Flag	Coverage Δ
integration	`42.2787% <18.5185%> (?)`
unit	`71.7107% <0.0000%> (+0.1306%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`55.5260% <ø> (+1.4757%)`	⬆️
parser	`∅ <ø> (∅)`
br	`49.2243% <ø> (-3.6750%)`	⬇️

Signed-off-by: Weizhen Wang <[email protected]>

hawkingrei · 2023-10-31T01:53:23Z

/test all

YangKeao

Rest LGTM

YangKeao · 2023-10-31T06:49:43Z

pkg/util/memory/meminfo.go

+// so if we are not in the container, we compare the cgroup memory limit and the physical memory,
+// the cgroup memory limit is smaller, we use the cgroup memory hook.
+func InitMemoryHook() {
+	if !cgroup.InContainer() {


How about if cgroup.InContainer() {logxxxx; return}?

Signed-off-by: Weizhen Wang <[email protected]>

YangKeao

LGTM

ti-chi-bot · 2023-10-31T09:35:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tiancaiamao, YangKeao

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [YangKeao,tiancaiamao]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Rustin170506

Thanks!

pkg/util/memory/meminfo.go

hawkingrei · 2023-10-31T10:03:11Z

/hold

Signed-off-by: Weizhen Wang <[email protected]>

Rustin170506 · 2023-10-31T10:23:42Z

/unhold

hawkingrei · 2023-10-31T14:59:12Z

/retest

hawkingrei · 2023-10-31T15:40:48Z

/retest

ti-chi-bot · 2023-10-31T16:13:20Z

In response to a cherrypick label: new pull request created to branch release-6.5: #48146.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2023-10-31T16:14:05Z

In response to a cherrypick label: new pull request created to branch release-7.1: #48147.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2023-10-31T16:14:48Z

In response to a cherrypick label: new pull request created to branch release-7.5: #48148.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2023-10-31T16:15:31Z

In response to a cherrypick label: new pull request created to branch release-5.3: #48149.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2023-10-31T16:16:18Z

In response to a cherrypick label: new pull request created to branch release-5.4: #48150.

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot · 2023-10-31T16:17:04Z

In response to a cherrypick label: new pull request created to branch release-6.1: #48151.

Signed-off-by: ti-chi-bot <[email protected]>

close #47442

*: support cgroup with systemd

21e07bc

Signed-off-by: Weizhen Wang <[email protected]>

ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 30, 2023

update

a65f034

Signed-off-by: Weizhen Wang <[email protected]>

hawkingrei requested review from bb7133, wshwsh12 and tiancaiamao October 31, 2023 06:31

tiancaiamao approved these changes Oct 31, 2023

View reviewed changes

ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 31, 2023

YangKeao reviewed Oct 31, 2023

View reviewed changes

update

e18005d

Signed-off-by: Weizhen Wang <[email protected]>

ti-chi-bot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 31, 2023

YangKeao approved these changes Oct 31, 2023

View reviewed changes

Rustin170506 reviewed Oct 31, 2023

View reviewed changes

pkg/util/memory/meminfo.go Outdated Show resolved Hide resolved

pkg/util/memory/meminfo.go Show resolved Hide resolved

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2023

update

b41b1f0

Signed-off-by: Weizhen Wang <[email protected]>

ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2023

ti-chi-bot bot merged commit 4667ed9 into pingcap:master Oct 31, 2023

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48146

Merged

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

518ca50

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48147

Merged

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

e157aeb

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48148

Merged

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

fd27823

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48149

Closed

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

6077129

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48150

Closed

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

218c9e5

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Oct 31, 2023

*: support cgroup with systemd (#48096) #48151

Closed

13 tasks

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2023

This is an automated cherry-pick of pingcap#48096

f105aa9

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot bot pushed a commit that referenced this pull request Nov 1, 2023

*: support cgroup with systemd (#48096) (#48148)

f22d359

close #47442

ti-chi-bot bot pushed a commit that referenced this pull request Nov 6, 2023

*: support cgroup with systemd (#48096) (#48146)

c9c0e88

close #47442

ti-chi-bot bot pushed a commit that referenced this pull request Nov 6, 2023

*: support cgroup with systemd (#48096) (#48147)

fc4edaf

close #47442

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: support cgroup with systemd #48096

*: support cgroup with systemd #48096

hawkingrei commented Oct 30, 2023 •

edited

Loading

codecov bot commented Oct 30, 2023 •

edited

Loading

hawkingrei commented Oct 31, 2023

YangKeao left a comment

YangKeao Oct 31, 2023

hawkingrei Oct 31, 2023

YangKeao left a comment

ti-chi-bot bot commented Oct 31, 2023

Rustin170506 left a comment

hawkingrei commented Oct 31, 2023

Rustin170506 commented Oct 31, 2023

hawkingrei commented Oct 31, 2023

hawkingrei commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

*: support cgroup with systemd #48096

*: support cgroup with systemd #48096

Conversation

hawkingrei commented Oct 30, 2023 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

codecov bot commented Oct 30, 2023 • edited Loading

Codecov Report

hawkingrei commented Oct 31, 2023

YangKeao left a comment

Choose a reason for hiding this comment

YangKeao Oct 31, 2023

Choose a reason for hiding this comment

hawkingrei Oct 31, 2023

Choose a reason for hiding this comment

YangKeao left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Oct 31, 2023

Rustin170506 left a comment

Choose a reason for hiding this comment

hawkingrei commented Oct 31, 2023

Rustin170506 commented Oct 31, 2023

hawkingrei commented Oct 31, 2023

hawkingrei commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

ti-chi-bot commented Oct 31, 2023

hawkingrei commented Oct 30, 2023 •

edited

Loading

codecov bot commented Oct 30, 2023 •

edited

Loading