Add configurable CCDB connection parameters

jobs/cc_deployment_updater/spec

@@ -91,6 +91,24 @@ properties:
     description: "The period in seconds after which connections are expired (omit to never expire connections), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
   ccdb.connection_expiration_random_delay:
     description: "The random delay in seconds to the expiration timeout (to prevent all connections being recreated simultaneously), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
+  ccdb.psql.statement_timeout:
+    description: "PostgreSQL statement_timeout in milliseconds - kills queries that run longer than this value (PostgreSQL only)"
+    default: 1800000
+  ccdb.psql.idle_in_transaction_session_timeout:
+    description: "PostgreSQL idle_in_transaction_session_timeout in milliseconds - closes sessions that remain idle in a transaction longer than this value (PostgreSQL only)"
+    default: 600000
+  ccdb.psql.keepalives:
+    description: "Enable TCP keepalives for PostgreSQL connections (1 to enable, 0 to disable; PostgreSQL only)"
+    default: 1
+  ccdb.psql.keepalives_idle:
+    description: "Seconds of idle time before TCP keepalives are sent for PostgreSQL connections (PostgreSQL only)"
+    default: 30
+  ccdb.psql.keepalives_interval:
+    description: "Seconds between TCP keepalive retransmissions for PostgreSQL connections (PostgreSQL only)"
+    default: 10
+  ccdb.psql.keepalives_count:
+    description: "Maximum number of TCP keepalive retransmissions before the connection is considered dead (PostgreSQL only)"
+    default: 3
 
   cc.readiness_port.deployment_updater:
     default: -1

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

@@ -78,6 +78,27 @@ db: &db
 <% if_p("ccdb.connection_expiration_random_delay") do |expiration_delay| %>
   connection_expiration_random_delay: <%= expiration_delay %>
 <% end %>
+<% if_p("ccdb.psql.statement_timeout", "ccdb.psql.idle_in_transaction_session_timeout", "ccdb.psql.keepalives", "ccdb.psql.keepalives_idle", "ccdb.psql.keepalives_interval", "ccdb.psql.keepalives_count") do %>
+  psql:
+<% if_p("ccdb.psql.statement_timeout") do |v| %>
+    statement_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.idle_in_transaction_session_timeout") do |v| %>
+    idle_in_transaction_session_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives") do |v| %>
+    keepalives: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_idle") do |v| %>
+    keepalives_idle: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_interval") do |v| %>
+    keepalives_interval: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_count") do |v| %>
+    keepalives_count: <%= v %>
+<% end %>
+<% end %>
 
 db_encryption_key: <%= p("cc.db_encryption_key") %>
 

jobs/cloud_controller_clock/spec

@@ -418,7 +418,24 @@ properties:
     description: "The period in seconds after which connections are expired (omit to never expire connections), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
   ccdb.connection_expiration_random_delay:
     description: "The random delay in seconds to the expiration timeout (to prevent all connections being recreated simultaneously), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
-
+  ccdb.psql.statement_timeout:
+    description: "PostgreSQL statement_timeout in milliseconds - kills queries that run longer than this value (PostgreSQL only)"
+    default: 1800000
+  ccdb.psql.idle_in_transaction_session_timeout:
+    description: "PostgreSQL idle_in_transaction_session_timeout in milliseconds - closes sessions that remain idle in a transaction longer than this value (PostgreSQL only)"
+    default: 600000
+  ccdb.psql.keepalives:
+    description: "Enable TCP keepalives for PostgreSQL connections (1 to enable, 0 to disable; PostgreSQL only)"
+    default: 1
+  ccdb.psql.keepalives_idle:
+    description: "Seconds of idle time before TCP keepalives are sent for PostgreSQL connections (PostgreSQL only)"
+    default: 30
+  ccdb.psql.keepalives_interval:
+    description: "Seconds between TCP keepalive retransmissions for PostgreSQL connections (PostgreSQL only)"
+    default: 10
+  ccdb.psql.keepalives_count:
+    description: "Maximum number of TCP keepalive retransmissions before the connection is considered dead (PostgreSQL only)"
+    default: 3
   uaa.ca_cert:
     description: "The certificate authority being used by UAA"
   uaa.ssl.port:

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

@@ -179,6 +179,27 @@ db: &db
 <% if_p("ccdb.connection_expiration_random_delay") do |expiration_delay| %>
   connection_expiration_random_delay: <%= expiration_delay %>
 <% end %>
+<% if_p("ccdb.psql.statement_timeout", "ccdb.psql.idle_in_transaction_session_timeout", "ccdb.psql.keepalives", "ccdb.psql.keepalives_idle", "ccdb.psql.keepalives_interval", "ccdb.psql.keepalives_count") do %>
+  psql:
+<% if_p("ccdb.psql.statement_timeout") do |v| %>
+    statement_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.idle_in_transaction_session_timeout") do |v| %>
+    idle_in_transaction_session_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives") do |v| %>
+    keepalives: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_idle") do |v| %>
+    keepalives_idle: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_interval") do |v| %>
+    keepalives_interval: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_count") do |v| %>
+    keepalives_count: <%= v %>
+<% end %>
+<% end %>
 
 <% system_domain = p("system_domain") %>
 

jobs/cloud_controller_ng/spec

@@ -783,6 +783,24 @@ properties:
     description: "The period in seconds after which connections are expired (omit to never expire connections), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
   ccdb.connection_expiration_random_delay:
     description: "The random delay in seconds to the expiration timeout (to prevent all connections being recreated simultaneously), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
+  ccdb.psql.statement_timeout:
+    description: "PostgreSQL statement_timeout in milliseconds - kills queries that run longer than this value (PostgreSQL only)"
+    default: 900000
+  ccdb.psql.idle_in_transaction_session_timeout:
+    description: "PostgreSQL idle_in_transaction_session_timeout in milliseconds - closes sessions that remain idle in a transaction longer than this value (PostgreSQL only)"
+    default: 600000
+  ccdb.psql.keepalives:
+    description: "Enable TCP keepalives for PostgreSQL connections (1 to enable, 0 to disable; PostgreSQL only)"
+    default: 1
+  ccdb.psql.keepalives_idle:
+    description: "Seconds of idle time before TCP keepalives are sent for PostgreSQL connections (PostgreSQL only)"
+    default: 30
+  ccdb.psql.keepalives_interval:
+    description: "Seconds between TCP keepalive retransmissions for PostgreSQL connections (PostgreSQL only)"
+    default: 10
+  ccdb.psql.keepalives_count:
+    description: "Maximum number of TCP keepalive retransmissions before the connection is considered dead (PostgreSQL only)"
+    default: 3
   ccdb.max_connections_per_local_worker:
     description: "Maximum database connections per cc local worker, if not set the ccng value is used (default)"
   ccdb.enable_paginate_window:

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

@@ -241,6 +241,27 @@ db: &db
   migration_psql_worker_memory_kb: <%= psql_worker_memory_kb %>
 <% end %>
   enable_paginate_window: <%= p("ccdb.enable_paginate_window") %>
+<% if_p("ccdb.psql.statement_timeout", "ccdb.psql.idle_in_transaction_session_timeout", "ccdb.psql.keepalives", "ccdb.psql.keepalives_idle", "ccdb.psql.keepalives_interval", "ccdb.psql.keepalives_count") do %>
+  psql:
+<% if_p("ccdb.psql.statement_timeout") do |v| %>
+    statement_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.idle_in_transaction_session_timeout") do |v| %>
+    idle_in_transaction_session_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives") do |v| %>
+    keepalives: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_idle") do |v| %>
+    keepalives_idle: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_interval") do |v| %>
+    keepalives_interval: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_count") do |v| %>
+    keepalives_count: <%= v %>
+<% end %>
+<% end %>
 
 <% scheme = p("login.protocol")
    system_domain = p("system_domain") %>

jobs/cloud_controller_worker/spec

@@ -377,6 +377,24 @@ properties:
     description: "The period in seconds after which connections are expired (omit to never expire connections), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
   ccdb.connection_expiration_random_delay:
     description: "The random delay in seconds to the expiration timeout (to prevent all connections being recreated simultaneously), passed directly to the Sequel gem - see https://sequel.jeremyevans.net/rdoc-plugins/files/lib/sequel/extensions/connection_expiration_rb.html for details"
+  ccdb.psql.statement_timeout:
+    description: "PostgreSQL statement_timeout in milliseconds - kills queries that run longer than this value (PostgreSQL only)"
+    default: 1800000
+  ccdb.psql.idle_in_transaction_session_timeout:
+    description: "PostgreSQL idle_in_transaction_session_timeout in milliseconds - closes sessions that remain idle in a transaction longer than this value (PostgreSQL only)"
+    default: 600000
+  ccdb.psql.keepalives:
+    description: "Enable TCP keepalives for PostgreSQL connections (1 to enable, 0 to disable; PostgreSQL only)"
+    default: 1
+  ccdb.psql.keepalives_idle:
+    description: "Seconds of idle time before TCP keepalives are sent for PostgreSQL connections (PostgreSQL only)"
+    default: 30
+  ccdb.psql.keepalives_interval:
+    description: "Seconds between TCP keepalive retransmissions for PostgreSQL connections (PostgreSQL only)"
+    default: 10
+  ccdb.psql.keepalives_count:
+    description: "Maximum number of TCP keepalive retransmissions before the connection is considered dead (PostgreSQL only)"
+    default: 3
 
   cc.database_encryption.keys:
     default: {}

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

@@ -134,6 +134,27 @@ db: &db
 <% if_p("ccdb.connection_expiration_random_delay") do |expiration_delay| %>
   connection_expiration_random_delay: <%= expiration_delay %>
 <% end %>
+<% if_p("ccdb.psql.statement_timeout", "ccdb.psql.idle_in_transaction_session_timeout", "ccdb.psql.keepalives", "ccdb.psql.keepalives_idle", "ccdb.psql.keepalives_interval", "ccdb.psql.keepalives_count") do %>
+  psql:
+<% if_p("ccdb.psql.statement_timeout") do |v| %>
+    statement_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.idle_in_transaction_session_timeout") do |v| %>
+    idle_in_transaction_session_timeout: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives") do |v| %>
+    keepalives: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_idle") do |v| %>
+    keepalives_idle: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_interval") do |v| %>
+    keepalives_interval: <%= v %>
+<% end %>
+<% if_p("ccdb.psql.keepalives_count") do |v| %>
+    keepalives_count: <%= v %>
+<% end %>
+<% end %>
 
 <% system_domain = p("system_domain") %>