starlingx/upstream
Code Issues Proposed changes

Setting the worker_rlimit_nofile minimum to 2048 for nginx

Browse Source 
In the docker image for mariadb-ingress if there are many cores
the calculated value for worker_rlimit_nofile ends up being 1024
which is too small.   This change sets the min to 2048.

Closes-Bug: 1816479
Change-Id: I4f198b703eda61d9a9531640ec01a2770f9ec172
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-02-21 09:52:23 -06:00
parent cb921ff934
commit bcce8c810f
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/openstack-helm-infra/centos/build_srpm.data
View File

@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
TIS_PATCH_VER=7
TIS_PATCH_VER=8

2
openstack/openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -20,6 +20,7 @@ Patch02: Mariadb-Support-adoption-of-running-single-node-mari.patch
Patch03: 0004-Allow-multiple-containers-per-daemonset-pod.patch
Patch04: fix-type-error-to-streamline-single-replica-mariadb-.patch
Patch05: Add-imagePullSecrets-in-service-account.patch
Patch06: 0006-Set-Min-NGINX-handles.patch
BuildRequires: helm
@ -33,6 +34,7 @@ Openstack Helm Infra charts
%patch03 -p1
%patch04 -p1
%patch05 -p1
%patch06 -p1
%build
# initialize helm and build the toolkit

27
openstack/openstack-helm-infra/files/0006-Set-Min-NGINX-handles.patch Normal file
View File

@ -0,0 +1,27 @@
From dda42ea9d18cacb7059652e95fb1b689f175f6ac Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 20 Feb 2019 13:56:27 -0600
Subject: [PATCH 6/6] Set Min NGINX handles
---
mariadb/files/nginx.tmpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl
index b74b2b6..9775d89 100644
--- a/mariadb/files/nginx.tmpl
+++ b/mariadb/files/nginx.tmpl
@@ -23,7 +23,9 @@ daemon off;
worker_processes {{ $cfg.WorkerProcesses }};
pid /run/nginx.pid;
-{{ if ne .MaxOpenFiles 0 }}
+{{ if lt .MaxOpenFiles 2048 }}
+worker_rlimit_nofile 2048;
+{{else}}
worker_rlimit_nofile {{ .MaxOpenFiles }};
{{ end}}
--
1.8.3.1