github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log message rather than error if setting quota fails

Browse Source
This commit is contained in:
Robert Krawitz
2019-05-21 15:47:28 -04:00
parent 46b3c75113
commit 9f4a4d1f49
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/volume/emptydir/empty_dir.go
View File

@@ -233,23 +233,27 @@ func (ed *emptyDir) SetUpAt(dir string, mounterArgs volume.MounterArgs) error {
volume.SetVolumeOwnership(ed, mounterArgs.FsGroup) volume.SetVolumeOwnership(ed, mounterArgs.FsGroup)
// If setting up the quota fails, just log a message but don't actually error out.
// We'll use the old du mechanism in this case, at least until we support
// enforcement.
if err == nil { if err == nil {
volumeutil.SetReady(ed.getMetaDir()) volumeutil.SetReady(ed.getMetaDir())
} if mounterArgs.DesiredSize != nil {
if mounterArgs.DesiredSize != nil { // Deliberately shadow the outer use of err as noted
hasQuotas, err := quota.SupportsQuotas(ed.mounter, dir) // above.
if err != nil { hasQuotas, err := quota.SupportsQuotas(ed.mounter, dir)
return fmt.Errorf("Unable to check for quota support on %s: %s", dir, err.Error())
}
if hasQuotas {
klog.V(4).Infof("emptydir trying to assign quota %v on %s", mounterArgs.DesiredSize, dir)
err := quota.AssignQuota(ed.mounter, dir, mounterArgs.PodUID, mounterArgs.DesiredSize)
if err != nil { if err != nil {
return fmt.Errorf("Set quota on %s failed %s", dir, err.Error()) klog.V(3).Infof("Unable to check for quota support on %s: %s", dir, err.Error())
} else if hasQuotas {
klog.V(4).Infof("emptydir trying to assign quota %v on %s", mounterArgs.DesiredSize, dir)
err := quota.AssignQuota(ed.mounter, dir, mounterArgs.PodUID, mounterArgs.DesiredSize)
if err != nil {
klog.V(3).Infof("Set quota on %s failed %s", dir, err.Error())
}
} }
} }
} }
return nil return err
} }
// setupTmpfs creates a tmpfs mount at the specified directory. // setupTmpfs creates a tmpfs mount at the specified directory.