Skip to content

Commit a386d32

Browse files
committed
api: make num_threads configurable
May be can then handle more of the simple queries, while the long queries block a smaller portion of the overall thread count.
1 parent af18ab6 commit a386d32

File tree

7 files changed

+12
-0
lines changed

7 files changed

+12
-0
lines changed

.github/workflows/reusable-stage-prod-deployment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ jobs:
102102
--set browserless.connectionTimeout=${{ vars.BROWSERLESS_CONNECTION_TIMEOUT_MS || '30000' }} \
103103
--set browserless.resources.requests.cpu=${{ vars.BROWSERLESS_CPU || '500m' }} \
104104
--set browserless.resources.requests.memory=${{ vars.BROWSERLESS_MEMORY || '800Mi' }} \
105+
--set api.num_threads=${{ vars.API_NUM_THREADS != null && vars.API_NUM_THREADS || null }} \
105106
--set api.resources.requests.cpu=${{ vars.PHP_CPU || '1000m' }} \
106107
--set api.resources.requests.memory=${{ vars.PHP_MEMORY || '500Mi' }} \
107108
--set api.resources.limits.cpu=${{ vars.PHP_CPULIMIT || '1900m' }} \

.helm/.env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ POSTGRES_URL=
66
POSTGRES_ADMIN_URL=
77

88
API_CACHE_ENABLED=false
9+
#API_NUM_THREADS=16
910

1011
BASIC_AUTH_ENABLED=false
1112
BASIC_AUTH_USERNAME=test

.helm/deploy-to-cluster.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ for i in 1; do
5252
if [ -n "$API_SENTRY_DSN" ]; then
5353
values="$values --set api.sentryDsn=$API_SENTRY_DSN"
5454
fi
55+
if [ -n "$API_NUM_THREADS" ]; then
56+
values="$values --set api.num_threads=$API_NUM_THREADS"
57+
fi
5558
if [ -n "$FRONTEND_SENTRY_DSN" ]; then
5659
values="$values --set frontend.sentryDsn=$FRONTEND_SENTRY_DSN"
5760
fi

.helm/ecamp3/templates/api_configmap.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ data:
2929
{{- else }}
3030
VARNISH_API_URL: {{ "" | quote }}
3131
{{- end}}
32+
{{- if .Values.api.num_threads }}
33+
NUM_THREADS: {{ .Values.api.num_threads | quote }}
34+
{{- end }}

.helm/ecamp3/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ api:
6262
clientId: 'WrKABq7GwmC6h1F0W73OGX_fOTHWWXnKXfrPMHOdQWY'
6363
clientSecret: 'oQ164RDMIAocL6PhmCoeT1Ymcg-7WcOJZdxCnIph5gM'
6464
baseUrl: 'https://jubla.puzzle.ch'
65+
num_threads:
6566
resources:
6667
requests:
6768
cpu: 10m

api/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ FROM dunglas/frankenphp:1.2-php8.3.13 AS frankenphp_upstream
1212
# Base FrankenPHP image
1313
FROM frankenphp_upstream AS frankenphp_base
1414

15+
ENV NUM_THREADS=4
16+
1517
WORKDIR /app
1618

1719
# persistent / runtime deps

api/docker/caddy/Caddyfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{$CADDY_GLOBAL_OPTIONS}
66

77
frankenphp {
8+
num_threads {$NUM_THREADS}
89
{$FRANKENPHP_CONFIG}
910
}
1011

0 commit comments

Comments
 (0)