From 37580d871ac7f59448c1b06b432d61331c86a27d Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 3 Jul 2023 13:22:33 -0400 Subject: [PATCH] libpod: use new libcontainer blockIO constructors [NO NEW TESTS NEEDED] Signed-off-by: Peter Hunt --- libpod/oci_conmon_linux.go | 44 +++++++------------------------------- 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 5740d70664..9819c83bae 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -267,49 +267,25 @@ func GetLimits(resource *spec.LinuxResources) (runcconfig.Resources, error) { if resource.BlockIO != nil { if len(resource.BlockIO.ThrottleReadBpsDevice) > 0 { for _, entry := range resource.BlockIO.ThrottleReadBpsDevice { - throttle := &runcconfig.ThrottleDevice{} - dev := &runcconfig.BlockIODevice{ - Major: entry.Major, - Minor: entry.Minor, - } - throttle.BlockIODevice = *dev - throttle.Rate = entry.Rate + throttle := runcconfig.NewThrottleDevice(entry.Major, entry.Minor, entry.Rate) final.BlkioThrottleReadBpsDevice = append(final.BlkioThrottleReadBpsDevice, throttle) } } if len(resource.BlockIO.ThrottleWriteBpsDevice) > 0 { for _, entry := range resource.BlockIO.ThrottleWriteBpsDevice { - throttle := &runcconfig.ThrottleDevice{} - dev := &runcconfig.BlockIODevice{ - Major: entry.Major, - Minor: entry.Minor, - } - throttle.BlockIODevice = *dev - throttle.Rate = entry.Rate + throttle := runcconfig.NewThrottleDevice(entry.Major, entry.Minor, entry.Rate) final.BlkioThrottleWriteBpsDevice = append(final.BlkioThrottleWriteBpsDevice, throttle) } } if len(resource.BlockIO.ThrottleReadIOPSDevice) > 0 { for _, entry := range resource.BlockIO.ThrottleReadIOPSDevice { - throttle := &runcconfig.ThrottleDevice{} - dev := &runcconfig.BlockIODevice{ - Major: entry.Major, - Minor: entry.Minor, - } - throttle.BlockIODevice = *dev - throttle.Rate = entry.Rate + throttle := runcconfig.NewThrottleDevice(entry.Major, entry.Minor, entry.Rate) final.BlkioThrottleReadIOPSDevice = append(final.BlkioThrottleReadIOPSDevice, throttle) } } if len(resource.BlockIO.ThrottleWriteIOPSDevice) > 0 { for _, entry := range resource.BlockIO.ThrottleWriteIOPSDevice { - throttle := &runcconfig.ThrottleDevice{} - dev := &runcconfig.BlockIODevice{ - Major: entry.Major, - Minor: entry.Minor, - } - throttle.BlockIODevice = *dev - throttle.Rate = entry.Rate + throttle := runcconfig.NewThrottleDevice(entry.Major, entry.Minor, entry.Rate) final.BlkioThrottleWriteIOPSDevice = append(final.BlkioThrottleWriteIOPSDevice, throttle) } } @@ -321,18 +297,14 @@ func GetLimits(resource *spec.LinuxResources) (runcconfig.Resources, error) { } if len(resource.BlockIO.WeightDevice) > 0 { for _, entry := range resource.BlockIO.WeightDevice { - weight := &runcconfig.WeightDevice{} - dev := &runcconfig.BlockIODevice{ - Major: entry.Major, - Minor: entry.Minor, - } + var w, lw uint16 if entry.Weight != nil { - weight.Weight = *entry.Weight + w = *entry.Weight } if entry.LeafWeight != nil { - weight.LeafWeight = *entry.LeafWeight + lw = *entry.LeafWeight } - weight.BlockIODevice = *dev + weight := runcconfig.NewWeightDevice(entry.Major, entry.Minor, w, lw) final.BlkioWeightDevice = append(final.BlkioWeightDevice, weight) } }