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

feature: add cgroupfs in Info API #2148

Merged

Conversation

allencloud
Copy link
Collaborator

Signed-off-by: Allen Sun allensun.shl@alibaba-inc.com

Ⅰ. Describe what this PR did

add cgroupfs in Info API.

current pouchd only supports directly managing cgroupfs. In the future we will support this config in the daemon configuration.

TODO: add 'systemd' to make systemd manage cgroupfs rather than directly using it.

Ⅱ. Does this pull request fix one issue?

fix #2143

Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗?)

added in integraion test.

Ⅳ. Describe how to verify it

none

Ⅴ. Special notes for reviews

none

// current pouchd only supports directly managing cgroupfs.
// TODO: add 'systemd' to make systemd manage cgroupfs rather than directly using it.
// In the future we will support this config in the daemon configuration.
return "cgroupfs"
Copy link
Contributor

Choose a reason for hiding this comment

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

Now we only support cgroupfs, systemd may put into consider, can you try to get this type from somewhere?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

can you try to get this type from somewhere

Could you explain a little bit more about the above sentence? @Ace-Tang Thanks a lot.

Copy link
Contributor

Choose a reason for hiding this comment

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

Not hardcode cgroup driver.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

OK, I see. Thanks a lot.

@codecov-io
Copy link

codecov-io commented Aug 23, 2018

Codecov Report

Merging #2148 into master will decrease coverage by 1.75%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2148      +/-   ##
==========================================
- Coverage   64.31%   62.56%   -1.76%     
==========================================
  Files         209      209              
  Lines       16664    17579     +915     
==========================================
+ Hits        10718    10998     +280     
- Misses       4614     5208     +594     
- Partials     1332     1373      +41
Flag Coverage Δ
#criv1alpha1test 32.78% <0%> (-0.12%) ⬇️
#criv1alpha2test 33.49% <0%> (+0.1%) ⬆️
#integrationtest 39.23% <100%> (+0.01%) ⬆️
#unittest 23.85% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
daemon/config/config.go 41.83% <100%> (-6.92%) ⬇️
daemon/mgr/system.go 77.86% <100%> (+0.18%) ⬆️
apis/opts/mountpoint.go 75.55% <0%> (-14.45%) ⬇️
daemon/mgr/container.go 50.32% <0%> (-6.4%) ⬇️
daemon/mgr/container_types.go 74.1% <0%> (-5.45%) ⬇️
storage/quota/quota.go 15.26% <0%> (-2.57%) ⬇️
daemon/mgr/container_storage.go 47.9% <0%> (-1.62%) ⬇️
cri/v1alpha1/cri.go 63.02% <0%> (-0.35%) ⬇️
storage/quota/grpquota.go 0% <0%> (ø) ⬆️
... and 3 more

@zhangxiaoyu-zidif
Copy link

/LGTM

Signed-off-by: Allen Sun <allensun.shl@alibaba-inc.com>
@allencloud
Copy link
Collaborator Author

Ping @Ace-Tang
Could you help review this, again?

@Ace-Tang
Copy link
Contributor

lgtm

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Aug 30, 2018
@Ace-Tang Ace-Tang merged commit ef99853 into AliyunContainerService:master Aug 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature LGTM one maintainer or community participant agrees to merge the pull reuqest. size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cgroup driver is <empty> when execute pouch info
5 participants