small clean up

This commit is contained in:
Nikolas
2021-05-17 10:25:38 +03:00
parent 0a5691d146
commit 41ac1430db
3 changed files with 0 additions and 16 deletions

0
docker-entrypoint.sh Normal file → Executable file
View File

0
envsubst-on-templates.sh Normal file → Executable file
View File

16
tune-worker-processes.sh Normal file → Executable file
View File

@@ -1,22 +1,16 @@
#!/bin/sh #!/bin/sh
# vim:sw=2:ts=2:sts=2:et # vim:sw=2:ts=2:sts=2:et
set -eu set -eu
LC_ALL=C LC_ALL=C
ME=$( basename "$0" ) ME=$( basename "$0" )
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
[ "${NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE:-}" ] || exit 0 [ "${NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE:-}" ] || exit 0
touch /etc/nginx/nginx.conf 2>/dev/null || { echo >&2 "$ME: error: can not modify /etc/nginx/nginx.conf (read-only file system?)"; exit 0; } touch /etc/nginx/nginx.conf 2>/dev/null || { echo >&2 "$ME: error: can not modify /etc/nginx/nginx.conf (read-only file system?)"; exit 0; }
ceildiv() { ceildiv() {
num=$1 num=$1
div=$2 div=$2
echo $(( (num + div - 1) / div )) echo $(( (num + div - 1) / div ))
} }
get_cpuset() { get_cpuset() {
cpusetroot=$1 cpusetroot=$1
cpusetfile=$2 cpusetfile=$2
@@ -49,7 +43,6 @@ get_quota() {
[ "$ncpu" -gt 0 ] || return [ "$ncpu" -gt 0 ] || return
echo "$ncpu" echo "$ncpu"
} }
get_quota_v2() { get_quota_v2() {
cpuroot=$1 cpuroot=$1
ncpu=0 ncpu=0
@@ -62,7 +55,6 @@ get_quota_v2() {
[ "$ncpu" -gt 0 ] || return [ "$ncpu" -gt 0 ] || return
echo "$ncpu" echo "$ncpu"
} }
get_cgroup_v1_path() { get_cgroup_v1_path() {
needle=$1 needle=$1
found= found=
@@ -126,7 +118,6 @@ __EOF__
esac esac
echo "$foundroot" echo "$foundroot"
} }
get_cgroup_v2_path() { get_cgroup_v2_path() {
found= found=
foundroot= foundroot=
@@ -160,28 +151,22 @@ __EOF__
esac esac
echo "$foundroot" echo "$foundroot"
} }
ncpu_online=$( getconf _NPROCESSORS_ONLN ) ncpu_online=$( getconf _NPROCESSORS_ONLN )
ncpu_cpuset= ncpu_cpuset=
ncpu_quota= ncpu_quota=
ncpu_cpuset_v2= ncpu_cpuset_v2=
ncpu_quota_v2= ncpu_quota_v2=
cpuset=$( get_cgroup_v1_path "cpuset" ) cpuset=$( get_cgroup_v1_path "cpuset" )
[ "$cpuset" ] && ncpu_cpuset=$( get_cpuset "$cpuset" "cpuset.effective_cpus" ) [ "$cpuset" ] && ncpu_cpuset=$( get_cpuset "$cpuset" "cpuset.effective_cpus" )
[ "$ncpu_cpuset" ] || ncpu_cpuset=$ncpu_online [ "$ncpu_cpuset" ] || ncpu_cpuset=$ncpu_online
cpu=$( get_cgroup_v1_path "cpu" ) cpu=$( get_cgroup_v1_path "cpu" )
[ "$cpu" ] && ncpu_quota=$( get_quota "$cpu" ) [ "$cpu" ] && ncpu_quota=$( get_quota "$cpu" )
[ "$ncpu_quota" ] || ncpu_quota=$ncpu_online [ "$ncpu_quota" ] || ncpu_quota=$ncpu_online
cgroup_v2=$( get_cgroup_v2_path ) cgroup_v2=$( get_cgroup_v2_path )
[ "$cgroup_v2" ] && ncpu_cpuset_v2=$( get_cpuset "$cgroup_v2" "cpuset.cpus.effective" ) [ "$cgroup_v2" ] && ncpu_cpuset_v2=$( get_cpuset "$cgroup_v2" "cpuset.cpus.effective" )
[ "$ncpu_cpuset_v2" ] || ncpu_cpuset_v2=$ncpu_online [ "$ncpu_cpuset_v2" ] || ncpu_cpuset_v2=$ncpu_online
[ "$cgroup_v2" ] && ncpu_quota_v2=$( get_quota_v2 "$cgroup_v2" ) [ "$cgroup_v2" ] && ncpu_quota_v2=$( get_quota_v2 "$cgroup_v2" )
[ "$ncpu_quota_v2" ] || ncpu_quota_v2=$ncpu_online [ "$ncpu_quota_v2" ] || ncpu_quota_v2=$ncpu_online
ncpu=$( printf "%s\n%s\n%s\n%s\n%s\n" \ ncpu=$( printf "%s\n%s\n%s\n%s\n%s\n" \
"$ncpu_online" \ "$ncpu_online" \
"$ncpu_cpuset" \ "$ncpu_cpuset" \
@@ -190,5 +175,4 @@ ncpu=$( printf "%s\n%s\n%s\n%s\n%s\n" \
"$ncpu_quota_v2" \ "$ncpu_quota_v2" \
| sort -n \ | sort -n \
| head -n 1 ) | head -n 1 )
sed -i.bak -r 's/^(worker_processes)(.*)$/# Commented out by '"$ME"' on '"$(date)"'\n#\1\2\n\1 '"$ncpu"';/' /etc/nginx/nginx.conf sed -i.bak -r 's/^(worker_processes)(.*)$/# Commented out by '"$ME"' on '"$(date)"'\n#\1\2\n\1 '"$ncpu"';/' /etc/nginx/nginx.conf