Bladeren bron

Merge pull request #11545 from cpuguy83/remove_allocator_warning

Don't warn when ip_local_port_range not found
Jessie Frazelle 10 jaren geleden
bovenliggende
commit
ccd4181d10
1 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 3 2
      daemon/networkdriver/portallocator/portallocator.go

+ 3 - 2
daemon/networkdriver/portallocator/portallocator.go

@@ -79,10 +79,11 @@ func NewErrPortAlreadyAllocated(ip string, port int) ErrPortAlreadyAllocated {
 
 func init() {
 	const portRangeKernelParam = "/proc/sys/net/ipv4/ip_local_port_range"
+	portRangeFallback := fmt.Sprintf("using fallback port range %d-%d", beginPortRange, endPortRange)
 
 	file, err := os.Open(portRangeKernelParam)
 	if err != nil {
-		log.Warnf("Failed to read %s kernel parameter: %v", portRangeKernelParam, err)
+		log.Warnf("port allocator - %s due to error: %v", portRangeFallback, err)
 		return
 	}
 	var start, end int
@@ -91,7 +92,7 @@ func init() {
 		if err == nil {
 			err = fmt.Errorf("unexpected count of parsed numbers (%d)", n)
 		}
-		log.Errorf("Failed to parse port range from %s: %v", portRangeKernelParam, err)
+		log.Errorf("port allocator - failed to parse system ephemeral port range from %s - %s: %v", portRangeKernelParam, portRangeFallback, err)
 		return
 	}
 	beginPortRange = start