dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-04 15:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49224 from thaJeztah/std_errs

Browse Source 
libnetwork/osl: Namespace.setSysctls: use stdlib errors
This commit is contained in:
Rob Murray
2025-01-07 12:01:38 +00:00
committed by GitHub
parent b2450ff16d f4e2cfa209
commit 3c628f7b45
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libnetwork/osl/interface_linux.go
View File

@@ -14,7 +14,6 @@ import (
"github.com/docker/docker/internal/nlwrap"
"github.com/docker/docker/libnetwork/ns"
"github.com/docker/docker/libnetwork/types"
"github.com/pkg/errors"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
"go.opentelemetry.io/otel"
@@ -480,17 +479,17 @@ func (n *Namespace) setSysctls(ctx context.Context, ifName string, sysctls []str
if fi, err := os.Stat(sysPath); err != nil || !fi.Mode().IsRegular() {
errF = fmt.Errorf("%s is not a sysctl file", sysPath)
} else if curVal, err := os.ReadFile(sysPath); err != nil {
errF = errors.Wrapf(err, "unable to read '%s'", sysPath)
errF = fmt.Errorf("unable to read '%s': %w", sysPath, err)
} else if strings.TrimSpace(string(curVal)) == v {
// The value is already correct, don't try to write the file in case
// "/proc/sys/net" is a read-only filesystem.
} else if err := os.WriteFile(sysPath, []byte(v), 0o644); err != nil {
errF = errors.Wrapf(err, "unable to write to '%s'", sysPath)
errF = fmt.Errorf("unable to write to '%s': %w", sysPath, err)
}
}
if err := n.InvokeFunc(f); err != nil {
return errors.Wrapf(err, "failed to run sysctl setter in network namespace")
return fmt.Errorf("failed to run sysctl setter in network namespace: %w", err)
}
if errF != nil {
return errF