DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #607 from aledbf/master

Browse source 
Allow custom server_names_hash_max_size & server_names_hash_bucket_size
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-04-14 22:20:38 -03:00 committed by GitHub
commit cd6a2123c4
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -341,9 +341,7 @@ func (n *NGINXController) SetListers(lister ingress.StoreLister) {
// if an error is returned means requeue the update // if an error is returned means requeue the update
func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, error) { func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, error) {
var longestName int var longestName int
var serverNames int
for _, srv := range ingressCfg.Servers { for _, srv := range ingressCfg.Servers {
serverNames += len([]byte(srv.Hostname))
if longestName < len(srv.Hostname) { if longestName < len(srv.Hostname) {
longestName = len(srv.Hostname) longestName = len(srv.Hostname)
} }
@ -366,15 +364,13 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) ([]byte, er
// https://trac.nginx.org/nginx/ticket/352 // https://trac.nginx.org/nginx/ticket/352
// https://trac.nginx.org/nginx/ticket/631 // https://trac.nginx.org/nginx/ticket/631
nameHashBucketSize := nextPowerOf2(longestName) nameHashBucketSize := nextPowerOf2(longestName)
if nameHashBucketSize > cfg.ServerNameHashBucketSize { if cfg.ServerNameHashBucketSize == 0 {
glog.V(3).Infof("adjusting ServerNameHashBucketSize variable from %v to %v", glog.V(3).Infof("adjusting ServerNameHashBucketSize variable to %v", nameHashBucketSize)
cfg.ServerNameHashBucketSize, nameHashBucketSize)
cfg.ServerNameHashBucketSize = nameHashBucketSize cfg.ServerNameHashBucketSize = nameHashBucketSize
} }
serverNameHashMaxSize := nextPowerOf2(serverNames) serverNameHashMaxSize := nextPowerOf2(len(ingressCfg.Servers))
if serverNameHashMaxSize > cfg.ServerNameHashMaxSize { if cfg.ServerNameHashMaxSize == 0 {
glog.V(3).Infof("adjusting ServerNameHashMaxSize variable from %v to %v", glog.V(3).Infof("adjusting ServerNameHashMaxSize variable to %v", serverNameHashMaxSize)
cfg.ServerNameHashMaxSize, serverNameHashMaxSize)
cfg.ServerNameHashMaxSize = serverNameHashMaxSize cfg.ServerNameHashMaxSize = serverNameHashMaxSize
} }

2
controllers/nginx/pkg/config/config.go
View file

@ -283,8 +283,6 @@ func NewDefault() Configuration {
MaxWorkerConnections: 16384, MaxWorkerConnections: 16384,
MapHashBucketSize: 64, MapHashBucketSize: 64,
ProxyRealIPCIDR: defIPCIDR, ProxyRealIPCIDR: defIPCIDR,
ServerNameHashMaxSize: 512,
ServerNameHashBucketSize: 64,
ShowServerTokens: true, ShowServerTokens: true,
SSLBufferSize: sslBufferSize, SSLBufferSize: sslBufferSize,
SSLCiphers: sslCiphers, SSLCiphers: sslCiphers,