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

bugfix: set memory swap initial value to 0 #1466

Merged
merged 1 commit into from
Jun 5, 2018
Merged

bugfix: set memory swap initial value to 0 #1466

merged 1 commit into from
Jun 5, 2018

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Jun 4, 2018

Signed-off-by: Ace-Tang [email protected]

Ⅰ. Describe what this PR did

Set memory swap initial value to 0 and add more check in cgroup info check.

Ⅱ. Does this pull request fix one issue?

Fixes: #1463

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels Jun 4, 2018
@codecov-io
Copy link

Codecov Report

Merging #1466 into master will increase coverage by 23.72%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1466       +/-   ##
===========================================
+ Coverage   16.36%   40.08%   +23.72%     
===========================================
  Files         207      250       +43     
  Lines       13816    16352     +2536     
===========================================
+ Hits         2261     6555     +4294     
+ Misses      11399     8953     -2446     
- Partials      156      844      +688
Impacted Files Coverage Δ
daemon/mgr/container_utils.go 51.09% <0%> (+22.58%) ⬆️
daemon/logger/jsonfile/utils.go 70% <0%> (ø) ⬆️
pkg/term/term.go 0% <0%> (ø)
storage/volume/driver/proxy.go 53.42% <0%> (ø)
storage/volume/driver/driver.go 47.93% <0%> (ø)
cri/stream/remotecommand/attach.go 0% <0%> (ø)
apis/metrics/metrics.go 100% <0%> (ø)
cri/stream/request_cache.go 0% <0%> (ø)
pkg/jsonstream/stream.go 64.7% <0%> (ø)
registry/auth_challenge.go 62.5% <0%> (ø)
... and 112 more

@allencloud
Copy link
Collaborator

It works perfectly on my testing machine:

root@ubuntu:~/go/src/github.com/alibaba/pouch# git fetch upstream pull/1466/head:new-1466; git checkout new-1466; make install
remote: Counting objects: 5, done.
remote: Total 5 (delta 4), reused 5 (delta 4), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/alibaba/pouch
 * [new ref]         refs/pull/1466/head -> new-1466
Previous HEAD position was d35b6b3... Merge pull request #1450 from ZouRui89/log_add
Switched to branch 'new-1466'
GOOS=linux go build -o pouchd
go build -o pouch github.com/alibaba/pouch/cli
install
installing pouchd and pouch to /usr/local/bin
root@ubuntu:~/go/src/github.com/alibaba/pouch# pouch images
IMAGE ID       IMAGE NAME                                       SIZE
8ac48589692a   registry.hub.docker.com/library/busybox:1.28     710.83 KB
f6e427c148a7   registry.hub.docker.com/library/busybox:latest   710.78 KB
2d194b392dd1   registry.hub.docker.com/library/centos:latest    69.60 MB
0458a4468cbc   registry.hub.docker.com/library/ubuntu:16.04     40.89 MB
root@ubuntu:~/go/src/github.com/alibaba/pouch# pouch run -d registry.hub.docker.com/library/busybox:1.28 sleep 10000
8562a44bd7b173ea6aa3ca9531600247dc4226c4679ed8f3788d9f0c7d1000e3

@allencloud
Copy link
Collaborator

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jun 5, 2018
@allencloud allencloud merged commit f742cf2 into AliyunContainerService:master Jun 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project 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.

[bug] failed to write -1 to memory.memsw.limit_in_bytes
4 participants