From b6307058ec11621dd905b37a592ae28b37e3398c Mon Sep 17 00:00:00 2001
From: Damian Dabrowski <damian@dabrowski.cloud>
Date: Thu, 2 Dec 2021 19:18:39 +0100
Subject: [PATCH] Database connection pooling improvements

- Implemented new variable ``connection_recycle_time`` responsible for SQLAlchemy's connection recycling
- Set new default values for db pooling variables which are inherited from the global ones.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/819424
Change-Id: Id7b0c26409a0d1b33a679201655a4dd08bacc57a
---
 defaults/main.yml      | 4 ++++
 templates/aodh.conf.j2 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index e29e204..1315046 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -61,6 +61,10 @@ aodh_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"
 aodh_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('') }}"
 aodh_connection_string: "{{ aodh_db_type }}://{{ aodh_database_user }}:{{ aodh_container_db_password }}@{{ aodh_db_address }}/{{ aodh_database_name }}?charset=utf8{% if aodh_galera_use_ssl | bool %}&ssl_verify_cert=true{% if aodh_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ aodh_galera_ssl_ca_cert }}{% endif %}{% endif %}"
 aodh_galera_port: "{{ galera_port | default('3306') }}"
+aodh_db_max_overflow: "{{ openstack_db_max_overflow | default('50') }}"
+aodh_db_max_pool_size: "{{ openstack_db_max_pool_size | default('5') }}"
+aodh_db_pool_timeout: "{{ openstack_db_pool_timeout | default('30') }}"
+aodh_db_connection_recycle_time: "{{ openstack_db_connection_recycle_time | default('600') }}"
 
 # Oslo Messaging
 # RPC
diff --git a/templates/aodh.conf.j2 b/templates/aodh.conf.j2
index 26c9981..d25e1bc 100644
--- a/templates/aodh.conf.j2
+++ b/templates/aodh.conf.j2
@@ -16,6 +16,10 @@ port = {{ aodh_service_port }}
 
 [database]
 connection = {{ aodh_connection_string }}
+max_overflow = {{ aodh_db_max_overflow }}
+max_pool_size = {{ aodh_db_max_pool_size }}
+pool_timeout = {{ aodh_db_pool_timeout }}
+connection_recycle_time = {{ aodh_db_connection_recycle_time }}
 
 [keystone_authtoken]
 insecure = {{ keystone_service_internaluri_insecure | bool }}