Skip to content

Commit dc7ce12

Browse files
authored
chore: disable postgres timeouts for docker workflows (langgenius#27397)
1 parent eabdb09 commit dc7ce12

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

‎docker/.env.example‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,16 +260,18 @@ POSTGRES_MAINTENANCE_WORK_MEM=64MB
260260
POSTGRES_EFFECTIVE_CACHE_SIZE=4096MB
261261

262262
# Sets the maximum allowed duration of any statement before termination.
263-
# Default is 60000 milliseconds.
263+
# Default is 0 (no timeout).
264264
#
265265
# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT
266-
POSTGRES_STATEMENT_TIMEOUT=60000
266+
# A value of 0 prevents the server from timing out statements.
267+
POSTGRES_STATEMENT_TIMEOUT=0
267268

268269
# Sets the maximum allowed duration of any idle in-transaction session before termination.
269-
# Default is 60000 milliseconds.
270+
# Default is 0 (no timeout).
270271
#
271272
# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-IDLE-IN-TRANSACTION-SESSION-TIMEOUT
272-
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=60000
273+
# A value of 0 prevents the server from terminating idle sessions.
274+
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=0
273275

274276
# ------------------------------
275277
# Redis Configuration

‎docker/docker-compose-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ services:
115115
-c 'work_mem=${POSTGRES_WORK_MEM:-4MB}'
116116
-c 'maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}'
117117
-c 'effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}'
118-
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-60000}'
119-
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-60000}'
118+
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-0}'
119+
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-0}'
120120
volumes:
121121
- ./volumes/db/data:/var/lib/postgresql/data
122122
healthcheck:

‎docker/docker-compose.middleware.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ services:
1515
-c 'work_mem=${POSTGRES_WORK_MEM:-4MB}'
1616
-c 'maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}'
1717
-c 'effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}'
18-
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-60000}'
19-
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-60000}'
18+
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-0}'
19+
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-0}'
2020
volumes:
2121
- ${PGDATA_HOST_VOLUME:-./volumes/db/data}:/var/lib/postgresql/data
2222
ports:

‎docker/docker-compose.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ x-shared-env: &shared-api-worker-env
6868
POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
6969
POSTGRES_MAINTENANCE_WORK_MEM: ${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}
7070
POSTGRES_EFFECTIVE_CACHE_SIZE: ${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}
71-
POSTGRES_STATEMENT_TIMEOUT: ${POSTGRES_STATEMENT_TIMEOUT:-60000}
72-
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT: ${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-60000}
71+
POSTGRES_STATEMENT_TIMEOUT: ${POSTGRES_STATEMENT_TIMEOUT:-0}
72+
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT: ${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-0}
7373
REDIS_HOST: ${REDIS_HOST:-redis}
7474
REDIS_PORT: ${REDIS_PORT:-6379}
7575
REDIS_USERNAME: ${REDIS_USERNAME:-}
@@ -724,8 +724,8 @@ services:
724724
-c 'work_mem=${POSTGRES_WORK_MEM:-4MB}'
725725
-c 'maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}'
726726
-c 'effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}'
727-
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-60000}'
728-
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-60000}'
727+
-c 'statement_timeout=${POSTGRES_STATEMENT_TIMEOUT:-0}'
728+
-c 'idle_in_transaction_session_timeout=${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-0}'
729729
volumes:
730730
- ./volumes/db/data:/var/lib/postgresql/data
731731
healthcheck:

‎docker/middleware.env.example‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ POSTGRES_MAINTENANCE_WORK_MEM=64MB
4141
POSTGRES_EFFECTIVE_CACHE_SIZE=4096MB
4242

4343
# Sets the maximum allowed duration of any statement before termination.
44-
# Default is 60000 milliseconds.
44+
# Default is 0 (no timeout).
4545
#
4646
# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT
47-
POSTGRES_STATEMENT_TIMEOUT=60000
47+
# A value of 0 prevents the server from timing out statements.
48+
POSTGRES_STATEMENT_TIMEOUT=0
4849

4950
# Sets the maximum allowed duration of any idle in-transaction session before termination.
50-
# Default is 60000 milliseconds.
51+
# Default is 0 (no timeout).
5152
#
5253
# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-IDLE-IN-TRANSACTION-SESSION-TIMEOUT
53-
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=60000
54+
# A value of 0 prevents the server from terminating idle sessions.
55+
POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=0
5456

5557
# -----------------------------
5658
# Environment Variables for redis Service

0 commit comments

Comments
 (0)