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: don't set mount tab when rootfs diskquota is null #1926

Merged
merged 1 commit into from
Jul 30, 2018

Conversation

rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Jul 30, 2018

Ⅰ. Describe what this PR did

Fixes: When rootfs diskquota is null, it will not set mount tab

Ⅱ. Does this pull request fix one issue?

NONE

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com

Fixes: When rootfs diskquota is null, it will not set mount tab

Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels Jul 30, 2018
@rudyfly rudyfly requested review from Ace-Tang, HusterWan, fuweid and CodeJuan and removed request for Ace-Tang July 30, 2018 09:29
@codecov-io
Copy link

Codecov Report

Merging #1926 into master will increase coverage by 0.4%.
The diff coverage is 28.57%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master   #1926     +/-   ##
========================================
+ Coverage    62.8%   63.2%   +0.4%     
========================================
  Files         200     200             
  Lines       15567   15571      +4     
========================================
+ Hits         9777    9842     +65     
+ Misses       4544    4483     -61     
  Partials     1246    1246
Flag Coverage Δ
#criv1alpha1test 33.67% <28.57%> (+0.39%) ⬆️
#criv1alpha2test 34.19% <28.57%> (+0.46%) ⬆️
#integrationtest 38.29% <28.57%> (+0.36%) ⬆️
#unittest 20.7% <0%> (-0.01%) ⬇️
Impacted Files Coverage Δ
daemon/mgr/spec_hook.go 44.79% <28.57%> (+31.74%) ⬆️
ctrd/image.go 79.2% <0%> (-1.99%) ⬇️
cri/v1alpha1/cri.go 65.4% <0%> (+0.18%) ⬆️
cri/v1alpha2/cri.go 66.49% <0%> (+0.52%) ⬆️
cri/v1alpha2/cri_wrapper.go 55.17% <0%> (+1.29%) ⬆️
cri/v1alpha1/cri_wrapper.go 57.14% <0%> (+1.33%) ⬆️
ctrd/container.go 52.23% <0%> (+2.06%) ⬆️
storage/quota/quota.go 19.81% <0%> (+7.2%) ⬆️
storage/quota/prjquota.go 8.09% <0%> (+8.09%) ⬆️

@CodeJuan
Copy link
Contributor

LGTM

@CodeJuan CodeJuan merged commit 459618b into AliyunContainerService:master Jul 30, 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 size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants