github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37793 from caiyixiang/proxy

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 37066, 37793)

correct a few spelling mistakes
This commit is contained in:
Kubernetes Submit Queue 2016-12-04 23:01:43 -08:00 committed by GitHub
commit 0bea8ca301
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-proxy/app/server.go
View File

@ -383,17 +383,17 @@ func getConntrackMax(config *options.ProxyServerConfig) (int, error) {
if config.ConntrackMaxPerCore > 0 { if config.ConntrackMaxPerCore > 0 {
return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive") return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive")
} }
glog.V(3).Infof("getConntrackMax: using absolute conntrax-max (deprecated)") glog.V(3).Infof("getConntrackMax: using absolute conntrack-max (deprecated)")
return int(config.ConntrackMax), nil return int(config.ConntrackMax), nil
} }
if config.ConntrackMaxPerCore > 0 { if config.ConntrackMaxPerCore > 0 {
floor := int(config.ConntrackMin) floor := int(config.ConntrackMin)
scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU() scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU()
if scaled > floor { if scaled > floor {
glog.V(3).Infof("getConntrackMax: using scaled conntrax-max-per-core") glog.V(3).Infof("getConntrackMax: using scaled conntrack-max-per-core")
return scaled, nil return scaled, nil
} }
glog.V(3).Infof("getConntrackMax: using conntrax-min") glog.V(3).Infof("getConntrackMax: using conntrack-min")
return floor, nil return floor, nil
} }
return 0, nil return 0, nil