diff --git a/libnetwork/portallocator/portallocator.go b/libnetwork/portallocator/portallocator.go index 30323fe927..1dc935cbd7 100644 --- a/libnetwork/portallocator/portallocator.go +++ b/libnetwork/portallocator/portallocator.go @@ -110,6 +110,7 @@ func getDefaultPortRange() (int, int) { start, end, err = sanitizePortRange(start, end) } if err != nil { + logrus.WithError(err).Infof("falling back to default port range %d-%d", defaultPortRangeStart, defaultPortRangeEnd) start, end = defaultPortRangeStart, defaultPortRangeEnd } return start, end diff --git a/libnetwork/portallocator/portallocator_freebsd.go b/libnetwork/portallocator/portallocator_freebsd.go index d71038ed54..c23912b6fc 100644 --- a/libnetwork/portallocator/portallocator_freebsd.go +++ b/libnetwork/portallocator/portallocator_freebsd.go @@ -8,20 +8,19 @@ import ( func getDynamicPortRange() (start int, end int, err error) { portRangeKernelSysctl := []string{"net.inet.ip.portrange.hifirst", "net.ip.portrange.hilast"} - portRangeFallback := fmt.Sprintf("using fallback port range %d-%d", defaultPortRangeStart, defaultPortRangeEnd) portRangeLowCmd := exec.Command("/sbin/sysctl", portRangeKernelSysctl[0]) var portRangeLowOut bytes.Buffer portRangeLowCmd.Stdout = &portRangeLowOut cmdErr := portRangeLowCmd.Run() if cmdErr != nil { - return 0, 0, fmt.Errorf("port allocator - sysctl net.inet.ip.portrange.hifirst failed - %s: %v", portRangeFallback, err) + return 0, 0, fmt.Errorf("port allocator - sysctl net.inet.ip.portrange.hifirst failed: %v", err) } n, err := fmt.Sscanf(portRangeLowOut.String(), "%d", &start) if n != 1 || err != nil { if err == nil { err = fmt.Errorf("unexpected count of parsed numbers (%d)", n) } - return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range start from %s - %s: %v", portRangeLowOut.String(), portRangeFallback, err) + return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range start from %s: %v", portRangeLowOut.String(), err) } portRangeHighCmd := exec.Command("/sbin/sysctl", portRangeKernelSysctl[1]) @@ -29,14 +28,14 @@ func getDynamicPortRange() (start int, end int, err error) { portRangeHighCmd.Stdout = &portRangeHighOut cmdErr = portRangeHighCmd.Run() if cmdErr != nil { - return 0, 0, fmt.Errorf("port allocator - sysctl net.inet.ip.portrange.hilast failed - %s: %v", portRangeFallback, err) + return 0, 0, fmt.Errorf("port allocator - sysctl net.inet.ip.portrange.hilast failed: %v", err) } n, err = fmt.Sscanf(portRangeHighOut.String(), "%d", &end) if n != 1 || err != nil { if err == nil { err = fmt.Errorf("unexpected count of parsed numbers (%d)", n) } - return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range end from %s - %s: %v", portRangeHighOut.String(), portRangeFallback, err) + return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range end from %s: %v", portRangeHighOut.String(), err) } return start, end, nil } diff --git a/libnetwork/portallocator/portallocator_linux.go b/libnetwork/portallocator/portallocator_linux.go index 8ce696273e..ea991fad98 100644 --- a/libnetwork/portallocator/portallocator_linux.go +++ b/libnetwork/portallocator/portallocator_linux.go @@ -8,12 +8,10 @@ import ( func getDynamicPortRange() (start int, end int, err error) { const portRangeKernelParam = "/proc/sys/net/ipv4/ip_local_port_range" - portRangeFallback := fmt.Sprintf("using fallback port range %d-%d", defaultPortRangeStart, defaultPortRangeEnd) file, err := os.Open(portRangeKernelParam) if err != nil { - return 0, 0, fmt.Errorf("port allocator - %s due to error: %v", portRangeFallback, err) + return 0, 0, err } - defer file.Close() n, err := fmt.Fscanf(bufio.NewReader(file), "%d\t%d", &start, &end) @@ -21,7 +19,7 @@ func getDynamicPortRange() (start int, end int, err error) { if err == nil { err = fmt.Errorf("unexpected count of parsed numbers (%d)", n) } - return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range from %s - %s: %v", portRangeKernelParam, portRangeFallback, err) + return 0, 0, fmt.Errorf("port allocator - failed to parse system ephemeral port range from %s: %v", portRangeKernelParam, err) } return start, end, nil }