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

fix: ensure daemon start successfully after update damon offline #1743

Merged
merged 1 commit into from
Jul 18, 2018
Merged

fix: ensure daemon start successfully after update damon offline #1743

merged 1 commit into from
Jul 18, 2018

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented Jul 17, 2018

Signed-off-by: Ace-Tang aceapril@126.com

Ⅰ. Describe what this PR did

  1. make Namespace field not marshal to config file to ensure daemon
    restart successful after update daemon offline.
  2. add update daemon offline test.
  3. fix update daemon error when config file is not exist.

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@Ace-Tang Ace-Tang changed the title test: add update daemon offline test fix: make daemon restart after update damon offline Jul 17, 2018
@pouchrobot pouchrobot added the kind/bug This is bug report for project label Jul 17, 2018
@Ace-Tang Ace-Tang requested review from rudyfly and Letty5411 July 17, 2018 05:11
@codecov-io
Copy link

codecov-io commented Jul 17, 2018

Codecov Report

Merging #1743 into master will decrease coverage by 0.73%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #1743      +/-   ##
=========================================
- Coverage   14.14%   13.4%   -0.74%     
=========================================
  Files         281     281              
  Lines       56755   58487    +1732     
=========================================
- Hits         8027    7842     -185     
- Misses      47805   49711    +1906     
- Partials      923     934      +11
Impacted Files Coverage Δ
daemon/config/config.go 19.75% <ø> (ø) ⬆️
cli/update_daemon.go 0% <0%> (ø) ⬆️
daemon/mgr/container_envs.go 8.97% <0%> (-35.9%) ⬇️
pkg/utils/utils.go 61.73% <0%> (-28.01%) ⬇️
daemon/mgr/spec_process.go 45.18% <0%> (-22.6%) ⬇️
cri/v1alpha2/cri_utils.go 16.77% <0%> (-18.99%) ⬇️
daemon/mgr/container.go 34.56% <0%> (-17.91%) ⬇️
pkg/user/user.go 59.15% <0%> (-16.61%) ⬇️
cri/v1alpha1/cri_utils.go 19.28% <0%> (-15.64%) ⬇️
daemon/mgr/container_types.go 68.29% <0%> (-13.11%) ⬇️
... and 12 more

@Ace-Tang Ace-Tang changed the title fix: make daemon restart after update damon offline fix: ensure daemon start successfully after update damon offline Jul 17, 2018
1. make Namespace field not marshal to config file to ensure daemon
restart successful after update daemon offline.
2. add update daemon offline test.
3. fix update daemon error when config file is not exist.

Signed-off-by: Ace-Tang <aceapril@126.com>
@rudyfly
Copy link
Collaborator

rudyfly commented Jul 18, 2018

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jul 18, 2018
@Letty5411 Letty5411 merged commit 84da28c into AliyunContainerService:master Jul 18, 2018
@Ace-Tang Ace-Tang deleted the update_daemon_test branch July 18, 2018 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/test 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.

6 participants