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

Condition memory checks on cgroup version. #3419

Merged
merged 5 commits into from
Dec 8, 2021
Merged

Condition memory checks on cgroup version. #3419

merged 5 commits into from
Dec 8, 2021

Conversation

igrekun
Copy link
Contributor

@igrekun igrekun commented Dec 6, 2021

What type of PR is this?

  • bug
  • feature
  • enhancement

What does this PR do?

Fixes reading memory stats under cgroup v2.

Which issue(s)/PR(s) this PR relates to?

#3278

Special notes for your reviewer, ex. impact of this fix, etc:

memory.max return 'max' as string when no --memory flag provided to container on startup.
What should I do about it?

Additional context:

Checklist：

  • Documentation affected （Please add the label if documentation needs to be modified.)
  • Incompatible （If it is incompatible, please describe it and add corresponding label.）
  • Need to cherry-pick （If need to cherry-pick to some branches, please label the destination version(s).)
  • Performance impacted: Consumes more CPU/Memory

Release notes：

Please confirm whether to reflect in release notes and how to describe:

                                                            `

@CLAassistant
Copy link

CLAassistant commented Dec 6, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

yixinglu
yixinglu previously approved these changes Dec 7, 2021
View reviewed changes
Copy link
Contributor

@yixinglu yixinglu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yixinglu yixinglu added the ready-for-testing PR: ready for the CI test label Dec 7, 2021
@yixinglu yixinglu linked an issue Dec 7, 2021 that may be closed by this pull request
Compatible with cgroup v2 for memory utils #3278
Closed
jievince
jievince previously approved these changes Dec 7, 2021
View reviewed changes
Copy link
Contributor

@jievince jievince left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done! Could you make clang-format the code? The lint check has failed.

@igrekun igrekun dismissed stale reviews from jievince and yixinglu via e09a8e5 December 7, 2021 07:56
@igrekun
Copy link
Contributor Author

igrekun commented Dec 7, 2021

Sure! Formatted the code.

@yixinglu yixinglu marked this pull request as ready for review December 7, 2021 16:07
@codecov-commenter
Copy link

Codecov Report

Merging #3419 (fe57326) into master (ab73b4c) will increase coverage by 0.04%.
The diff coverage is 91.86%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3419      +/-   ##
==========================================
+ Coverage   85.23%   85.28%   +0.04%     
==========================================
  Files        1277     1278       +1     
  Lines      119088   119198     +110     
==========================================
+ Hits       101502   101655     +153     
+ Misses      17586    17543      -43
Impacted Files Coverage Δ
src/graph/optimizer/rule/CollapseProjectRule.cpp 98.24% <ø> (ø)
...timizer/rule/OptimizeEdgeIndexScanByFilterRule.cpp 90.54% <ø> (ø)
...ptimizer/rule/OptimizeTagIndexScanByFilterRule.cpp 90.27% <ø> (ø)
...h/optimizer/rule/PushLimitDownGetNeighborsRule.cpp 93.54% <ø> (ø)
...timizer/rule/PushStepLimitDownGetNeighborsRule.cpp 93.75% <ø> (ø)
...imizer/rule/PushStepSampleDownGetNeighborsRule.cpp 93.93% <ø> (ø)
src/graph/planner/plan/Query.h 97.61% <ø> (+0.16%) ⬆️
src/graph/util/FTIndexUtils.cpp 4.12% <ø> (ø)
src/graph/validator/FindPathValidator.cpp 84.78% <ø> (ø)
src/graph/validator/MutateValidator.h 100.00% <ø> (ø)
... and 48 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d6f83f3...fe57326. Read the comment docs.

@yixinglu yixinglu requested a review from jievince December 8, 2021 03:19
@yixinglu yixinglu merged commit e33924f into vesoft-inc:master Dec 8, 2021
@jamieliu1023 jamieliu1023 mentioned this pull request Dec 11, 2021
Closed
@wey-gu
Copy link
Contributor

wey-gu commented Jan 24, 2022

@Sophie-Xie please kindly cherry-pick this PR to 2.6.x & 3.x

Sophie-Xie pushed a commit that referenced this pull request Jan 24, 2022
@igrekun @Sophie-Xie
Condition memory checks on cgroup version. (#3419)
cbe0828 
* Condition memory checks on cgroup version.
* Fix formatting.
@Sophie-Xie Sophie-Xie added the cherry-pick-v2.6 PR: need cherry-pick to this version label Jan 24, 2022
@wey-gu wey-gu mentioned this pull request Jan 24, 2022
Closed
critical27 pushed a commit that referenced this pull request Jan 25, 2022
@Sophie-Xie @igrekun
Condition memory checks on cgroup version. (#3419) (#3792)
4b7ac78 
* Condition memory checks on cgroup version.
* Fix formatting.

Co-authored-by: Igor Rekun <igrekun@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jievince jievince jievince approved these changes

@Aiee Aiee Aiee approved these changes

@yixinglu yixinglu yixinglu approved these changes

@critical27 critical27 Awaiting requested review from critical27

Assignees
No one assigned
Labels
cherry-pick-v2.6 PR: need cherry-pick to this version ready-for-testing PR: ready for the CI test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Compatible with cgroup v2 for memory utils
8 participants
@igrekun @CLAassistant @codecov-commenter @wey-gu @yixinglu @Aiee @jievince @Sophie-Xie