From 8700f30155ac1dd2c05b43152ce2900e87d48123 Mon Sep 17 00:00:00 2001 From: dannylamb Date: Tue, 26 Oct 2021 17:05:32 -0300 Subject: [PATCH 1/2] _all_ the timeouts --- .env | 28 ++++++++++++ docker-compose.env.yml | 100 ++++++++++++++++++++++++++++++++++++++++- sample.env | 28 ++++++++++++ 3 files changed, 155 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 068db58d4..4c9ac8faf 100644 --- a/.env +++ b/.env @@ -102,6 +102,34 @@ DRUPAL_DEFAULT_S3_PRIVATE_PATH=pr # Google Tag Manager DRUPAL_GTM_CONTAINER_ID= +# PHP variables +PHP_DEFAULT_SOCKET_TIMEOUT=3600 +PHP_MAX_EXECUTION_TIME=3600 +PHP_MAX_FILE_UPLOADS=20 +PHP_MAX_INPUT_TIME=3600 +PHP_MEMORY_LIMIT=256M +PHP_POST_MAX_SIZE=128M +PHP_PROCESS_CONTROL_TIMEOUT=3600 +PHP_REQUEST_TERMINATE_TIMEOUT=3600 +PHP_UPLOAD_MAX_FILESIZE=128M + +# nginx variables +NGINX_CLIENT_BODY_TIMEOUT=3600 +NGINX_FASTCGI_READ_TIMEOUT=3600 +NGINX_FASTCGI_SEND_TIMEOUT=3600 +NGINX_FASTCGI_CONNECT_TIMEOUT=3600 +NGINX_KEEPALIVE_TIMEOUT=3600 +NGINX_LINGERING_TIMEOUT=3600 +NGINX_PROXY_READ_TIMEOUT=3600 +NGINX_PROXY_SEND_TIMEOUT=3600 +NGINX_PROXY_CONNECT_TIMEOUT=3600 +NGINX_SEND_TIMEOUT=3600 + +# Alpaca timeouts +ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS=7200000 +ALPACA_HTTP_CONNECT_TIMEOUT_MS=7200000 +ALPACA_HTTP_SOCKET_TIMEOUT_MS=7200000 + # Testing TEST_OPERATION_TIMEOUT_MS=60000 MIGRATION_ASSETS_IMAGE_TAG=e3a9c50.1633729168 diff --git a/docker-compose.env.yml b/docker-compose.env.yml index 85134f43d..723957006 100644 --- a/docker-compose.env.yml +++ b/docker-compose.env.yml @@ -51,10 +51,32 @@ services: # Password for admin user: https://karaf.apache.org/manual/latest/security # ALPACA_KARAF_ADMIN_PASSWORD: password + ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS: ${ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS:-7200000} + ALPACA_HTTP_CONNECT_TIMEOUT_MS: ${ALPACA_HTTP_CONNECT_TIMEOUT_MS:-7200000} + ALPACA_HTTP_SOCKET_TIMEOUT_MS: ${ALPACA_HTTP_SOCKET_TIMEOUT_MS:-7200000} cantaloupe: # No environment variables require overriding. crayfits: - # No environment variables require overriding. + environment: + NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600} + NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600} + NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600} + NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600} + NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600} + NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600} + NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600} + NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600} + NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600} + NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600} + PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600} + PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600} + PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20} + PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600} + PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M} + PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M} + PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600} + PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600} + PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M} mariadb: environment: # @@ -172,6 +194,25 @@ services: DRUPAL_IDP_BASEURL: ${IDP_BASEURL} DRUPAL_SP_ENTITYID: ${SP_ENTITYID} DRUPAL_GTM_CONTAINER_ID: ${DRUPAL_GTM_CONTAINER_ID} + NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600} + NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600} + NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600} + NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600} + NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600} + NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600} + NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600} + NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600} + NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600} + NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600} + PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600} + PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600} + PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20} + PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600} + PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M} + PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M} + PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600} + PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600} + PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M} idp: environment: IDP_BASEURL: ${IDP_BASEURL} @@ -197,6 +238,25 @@ services: a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0 rwIDAQAB -----END PUBLIC KEY----- + NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600} + NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600} + NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600} + NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600} + NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600} + NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600} + NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600} + NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600} + NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600} + NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600} + PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600} + PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600} + PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20} + PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600} + PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M} + PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M} + PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600} + PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600} + PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M} houdini: environment: # @@ -216,6 +276,25 @@ services: a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0 rwIDAQAB -----END PUBLIC KEY----- + NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600} + NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600} + NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600} + NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600} + NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600} + NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600} + NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600} + NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600} + NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600} + NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600} + PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600} + PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600} + PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20} + PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600} + PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M} + PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M} + PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600} + PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600} + PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M} hypercube: environment: # @@ -235,6 +314,25 @@ services: a3SNje4UXN+/1xUfQskxafP8CKVSr8xxtwzSureiskb5/98moAiutpUtp15yyAm0 rwIDAQAB -----END PUBLIC KEY----- + NGINX_CLIENT_BODY_TIMEOUT: ${NGINX_CLIENT_BODY_TIMEOUT:-3600} + NGINX_FASTCGI_READ_TIMEOUT: ${NGINX_FASTCGI_READ_TIMEOUT:-3600} + NGINX_FASTCGI_SEND_TIMEOUT: ${NGINX_FASTCGI_SEND_TIMEOUT:-3600} + NGINX_FASTCGI_CONNECT_TIMEOUT: ${NGINX_FASTCGI_CONNECT_TIMEOUT:-3600} + NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-3600} + NGINX_LINGERING_TIMEOUT: ${NGINX_LINGERING_TIMEOUT:-3600} + NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600} + NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600} + NGINX_PROXY_CONNECT_TIMEOUT: ${NGINX_PROXY_CONNECT_TIMEOUT:-3600} + NGINX_SEND_TIMEOUT: ${NGINX_SEND_TIMEOUT:-3600} + PHP_DEFAULT_SOCKET_TIMEOUT: ${PHP_DEFAULT_SOCKET_TIMEOUT:-3600} + PHP_MAX_EXECUTION_TIME: ${PHP_MAX_EXECUTION_TIME:-3600} + PHP_MAX_FILE_UPLOADS: ${PHP_MAX_FILE_UPLOADS:-20} + PHP_MAX_INPUT_TIME: ${PHP_MAX_INPUT_TIME:-3600} + PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-256M} + PHP_POST_MAX_SIZE: ${PHP_POST_MAX_SIZE:-128M} + PHP_PROCESS_CONTROL_TIMEOUT: ${PHP_PROCESS_CONTROL_TIMEOUT:-3600} + PHP_REQUEST_TERMINATE_TIMEOUT: ${PHP_REQUEST_TERMINATE_TIMEOUT:-3600} + PHP_UPLOAD_MAX_FILESIZE: ${PHP_UPLOAD_MAX_FILESIZE:-128M} minio: environment: MINIO_ACCESS_KEY: ${DRUPAL_DEFAULT_S3_ACCESS_KEY} diff --git a/sample.env b/sample.env index 6f2dec3df..cf973f051 100644 --- a/sample.env +++ b/sample.env @@ -60,3 +60,31 @@ REPOSITORY=islandora # The version of the isle-buildkit images, non isle-buildkit images have # their versions specified explicitly in their respective docker-compose files. TAG=latest + +# PHP variables +PHP_DEFAULT_SOCKET_TIMEOUT=3600 +PHP_MAX_EXECUTION_TIME=3600 +PHP_MAX_FILE_UPLOADS=20 +PHP_MAX_INPUT_TIME=3600 +PHP_MEMORY_LIMIT=256M +PHP_POST_MAX_SIZE=128M +PHP_PROCESS_CONTROL_TIMEOUT=3600 +PHP_REQUEST_TERMINATE_TIMEOUT=3600 +PHP_UPLOAD_MAX_FILESIZE=128M + +# nginx variables +NGINX_CLIENT_BODY_TIMEOUT=3600 +NGINX_FASTCGI_READ_TIMEOUT=3600 +NGINX_FASTCGI_SEND_TIMEOUT=3600 +NGINX_FASTCGI_CONNECT_TIMEOUT=3600 +NGINX_KEEPALIVE_TIMEOUT=3600 +NGINX_LINGERING_TIMEOUT=3600 +NGINX_PROXY_READ_TIMEOUT=3600 +NGINX_PROXY_SEND_TIMEOUT=3600 +NGINX_PROXY_CONNECT_TIMEOUT=3600 +NGINX_SEND_TIMEOUT=3600 + +# Alpaca timeouts +ALPACA_HTTP_CONNECTION_REQUEST_TIMEOUT_MS=7200000 +ALPACA_HTTP_CONNECT_TIMEOUT_MS=7200000 +ALPACA_HTTP_SOCKET_TIMEOUT_MS=7200000 From 096758d650b7780d4ebd391b336a69595ac52dad Mon Sep 17 00:00:00 2001 From: Aaron Birkland Date: Thu, 4 Nov 2021 11:48:22 -0400 Subject: [PATCH 2/2] Use timeout-enhanced buildkit image --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 4c9ac8faf..3e8da2578 100644 --- a/.env +++ b/.env @@ -70,7 +70,7 @@ REPOSITORY=ghcr.io/jhu-sheridan-libraries/idc-isle-dc # The version of the isle-buildkit images, non isle-buildkit images have # their versions specified explicitly in their respective docker-compose files. -TAG=upstream-20200824-f8d1e8e-60-g891acc8 +TAG=upstream-20200824-f8d1e8e-61-g1d7120b # Docker image and tag for snapshot image SNAPSHOT_TAG=upstream-20201007-739693ae-405-g521b43f.1630614319