Skip to content

Add configurable CCDB connection parameters #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WeiQuan0605 wants to merge 1 commit into
base: develop
Choose a base branch
from
+22 −0
Open

Add configurable CCDB connection parameters #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jobs/cloud_controller_ng/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,9 @@ 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.connection_parameters:
description: "Hash of PostgreSQL connection parameters passed directly to the database driver (e.g. statement_timeout, idle_in_transaction_session_timeout, keepalives, keepalives_idle, keepalives_interval, keepalives_count)"
default: {}
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:
Expand Down
8 changes: 8 additions & 0 deletions jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,14 @@ db: &db
migration_psql_worker_memory_kb: <%= psql_worker_memory_kb %>
<% end %>
enable_paginate_window: <%= p("ccdb.enable_paginate_window") %>
<% if_p("ccdb.connection_parameters") do |connection_parameters| %>
<% unless connection_parameters.empty? %>
connection_parameters:
<% connection_parameters.each do |key, value| %>
<%= key %>: <%= value %>
<% end %>
<% end %>
<% end %>

<% scheme = p("login.protocol")
system_domain = p("system_domain") %>
Expand Down
3 changes: 3 additions & 0 deletions jobs/cloud_controller_worker/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ 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.connection_parameters:
description: "Hash of PostgreSQL connection parameters passed directly to the database driver (e.g. statement_timeout, idle_in_transaction_session_timeout, keepalives, keepalives_idle, keepalives_interval, keepalives_count)"
default: {}

cc.database_encryption.keys:
default: {}
Expand Down
8 changes: 8 additions & 0 deletions jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,14 @@ db: &db
<% if_p("ccdb.connection_expiration_random_delay") do |expiration_delay| %>
connection_expiration_random_delay: <%= expiration_delay %>
<% end %>
<% if_p("ccdb.connection_parameters") do |connection_parameters| %>
<% unless connection_parameters.empty? %>
connection_parameters:
<% connection_parameters.each do |key, value| %>
<%= key %>: <%= value %>
<% end %>
<% end %>
<% end %>

<% system_domain = p("system_domain") %>

Expand Down