jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix, LeafWeight nil err 

Signed-off-by: root <yangshukui@huawei.com>
This commit is contained in:
root 2016-06-10 18:11:20 -07:00
parent ae312e5155
commit 56abe735f2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcontainer/specconv/spec_linux.go
View File

@ -392,7 +392,14 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
} }
if r.BlockIO.WeightDevice != nil { if r.BlockIO.WeightDevice != nil {
for _, wd := range r.BlockIO.WeightDevice { for _, wd := range r.BlockIO.WeightDevice {
weightDevice := configs.NewWeightDevice(wd.Major, wd.Minor, *wd.Weight, *wd.LeafWeight) var weight, leafWeight uint16
if wd.Weight != nil {
weight = *wd.Weight
}
if wd.LeafWeight != nil {
leafWeight = *wd.LeafWeight
}
weightDevice := configs.NewWeightDevice(wd.Major, wd.Minor, weight, leafWeight)
c.Resources.BlkioWeightDevice = append(c.Resources.BlkioWeightDevice, weightDevice) c.Resources.BlkioWeightDevice = append(c.Resources.BlkioWeightDevice, weightDevice)
} }
} }