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

enhance: clean the local-persist after integration tests #1400

Merged
merged 1 commit into from
May 25, 2018

Conversation

shaloulcy
Copy link
Contributor

@shaloulcy shaloulcy commented May 24, 2018

Signed-off-by: Eric Li lcy041536@gmail.com

Ⅰ. Describe what this PR did

After integration tests, we will clean the local-persist volume plugin

Ⅱ. Does this pull request fix one issue?

fix #1396

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented May 24, 2018

Codecov Report

Merging #1400 into master will decrease coverage by 3.84%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1400      +/-   ##
==========================================
- Coverage   38.72%   34.87%   -3.85%     
==========================================
  Files         250      254       +4     
  Lines       16630    18163    +1533     
==========================================
- Hits         6440     6335     -105     
- Misses       9362    11008    +1646     
+ Partials      828      820       -8
Impacted Files Coverage Δ
cri/v1alpha1/cri_utils.go 0% <0%> (-29.32%) ⬇️
cri/v1alpha2/cri_utils.go 0% <0%> (-28.42%) ⬇️
ctrd/image.go 60.96% <0%> (-24.32%) ⬇️
ctrd/watch.go 55.55% <0%> (-19.45%) ⬇️
daemon/mgr/image.go 49.67% <0%> (-19.42%) ⬇️
apis/server/router.go 75.15% <0%> (-16.03%) ⬇️
pkg/utils/utils.go 71.21% <0%> (-12.02%) ⬇️
daemon/mgr/image_store.go 84.86% <0%> (-4.57%) ⬇️
ctrd/client.go 52.66% <0%> (-2.28%) ⬇️
daemon/mgr/container.go 49.31% <0%> (-0.05%) ⬇️
... and 11 more

@shaloulcy shaloulcy force-pushed the plugin_sock_clean branch 3 times, most recently from d955b31 to 9c913c6 Compare May 24, 2018 06:16
@shaloulcy shaloulcy requested a review from Letty5411 May 24, 2018 07:08
hack/make.sh Outdated
function clean_local_persist
{
echo "Try cleaning local-persist"
pid=`ps axu|grep local-persist |grep -v grep|awk '{print $2}'`
Copy link
Contributor

@Letty5411 Letty5411 May 24, 2018

Choose a reason for hiding this comment

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

How about just pgrep ? And use $() instead of ``

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done it

hack/make.sh Outdated
echo "Try cleaning local-persist"
pid=`ps axu|grep local-persist |grep -v grep|awk '{print $2}'`

if [ -n "$pid" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

use [[ ]] instead of [ ]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done it

Signed-off-by: Eric Li <lcy041536@gmail.com>
@shaloulcy shaloulcy force-pushed the plugin_sock_clean branch from 9c913c6 to de673c5 Compare May 25, 2018 02:47
@rudyfly
Copy link
Collaborator

rudyfly commented May 25, 2018

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label May 25, 2018
@rudyfly rudyfly merged commit b2c5b3f into AliyunContainerService:master May 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/test 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.

[enhance] pouch info takes too long due to local-persist plugin
5 participants