blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

DCD-1362: Add tcpKeepAlive and socketTimeout for Jira dbconfig.xml

Browse Source
This commit is contained in:
Adam Brokes
2021-10-05 13:23:23 +11:00
parent 56d1200dd6
commit 1e0c97597b
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/jira_config/defaults/main.yml
View File

@@ -22,6 +22,11 @@ atl_tomcat_redirectport: ""
atl_tomcat_scheme: "http"
atl_tomcat_secure: "false"
# Mitigation of potentially stuck threads with certain network setup while using PostgreSQL
# https://confluence.atlassian.com/jirakb/connection-problems-to-postgresql-result-in-stuck-threads-in-jira-1047534091.html
atl_db_keepalive: 'true'
atl_db_sockettimeout: '240'
atl_db_poolminsize: '20'
atl_db_poolmaxsize: '100'
atl_db_minidle: '10'

2
roles/jira_config/molecule/default/tests/test_default.py
View File

@@ -15,6 +15,8 @@ def test_dbconfig_file(host):
assert f.contains("<username>atljira</username>")
assert f.contains("<password>molecule_password</password>")
assert f.contains("<connection-properties>tcpKeepAlive=true;socketTimeout=240</connection-properties>")
assert f.contains("<pool-min-size>1111</pool-min-size>")
assert f.contains("<pool-max-size>1111</pool-max-size>")
assert f.contains("<pool-min-idle>1111</pool-min-idle>")

2
roles/jira_config/molecule/jira_config_props/converge.yml
View File

@@ -13,6 +13,8 @@
atl_jvm_heap: 'PLACEHOLDER'
atl_jvm_opts: 'PLACEHOLDER'
atl_cluster_node_id: 'FAKEID'
atl_db_keepalive: 'false'
atl_db_sockettimeout: '111'
atl_db_poolminsize: 1111
atl_db_poolmaxsize: 1111
atl_db_minidle: 1111

2
roles/jira_config/molecule/jira_config_props/tests/test_default.py
View File

@@ -15,6 +15,8 @@ def test_dbconfig_file(host):
assert f.contains("<username>atljira</username>")
assert f.contains("<password>molecule_password</password>")
assert f.contains("<connection-properties>tcpKeepAlive=false;socketTimeout=111</connection-properties>")
assert f.contains("<pool-min-size>1111</pool-min-size>")
assert f.contains("<pool-max-size>1111</pool-max-size>")
assert f.contains("<pool-min-idle>1111</pool-min-idle>")

3
roles/jira_config/templates/dbconfig.xml.j2
View File

@@ -10,6 +10,9 @@
<username>{{ atl_jdbc_user }}</username>
<password>{{ atl_jdbc_password | replace("&", "&amp;") }}</password>
<driver-class>{{ atl_db_driver }}</driver-class>
{% if 'postgres' in atl_db_type %}
<connection-properties>tcpKeepAlive={{ atl_db_keepalive }};socketTimeout={{ atl_db_sockettimeout }}</connection-properties>
{% endif %}
<pool-min-size>{{ atl_db_poolminsize }}</pool-min-size>
<pool-max-size>{{ atl_db_poolmaxsize }}</pool-max-size>