CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-1724: Ability to override tenant datasource min/max configuration from env variables

Browse Source
This commit is contained in:
Arnold Galovics
2023-05-08 19:17:57 +02:00
committed by Adam Saghy
parent f24c9f8084
commit 7f5b87694b
5 changed files with 168 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/DataSourcePerTenantServiceFactoryTest.java
+105
View File
@@ -155,9 +155,16 @@ public class DataSourcePerTenantServiceFactoryTest {
given(tenantHikariConfig.isAutoCommit()).willReturn(MASTER_DB_AUTO_COMMIT_ENABLED);
given(hikariDataSourceFactory.create(any())).willReturn(mock(HikariDataSource.class));
FineractProperties.FineractConfigProperties configProperties = new FineractProperties.FineractConfigProperties();
configProperties.setMinPoolSize(-1);
configProperties.setMaxPoolSize(-1);
FineractProperties.FineractTenantProperties tenantPropertiesMock = mock(FineractProperties.FineractTenantProperties.class);
given(tenantPropertiesMock.getEncryption()).willReturn(MASTER_ENCRYPTION);
given(tenantPropertiesMock.getMasterPassword()).willReturn(MASTER_MASTER_PASSWORD);
given(tenantPropertiesMock.getConfig()).willReturn(configProperties);
given(fineractProperties.getTenant()).willReturn(tenantPropertiesMock);
given(databasePasswordEncryptor.isMasterPasswordHashValid(any())).willReturn(true);
@@ -195,6 +202,104 @@ public class DataSourcePerTenantServiceFactoryTest {
assertEquals(MASTER_DB_AUTO_COMMIT_ENABLED, hikariConfig.isAutoCommit());
}
@Test
void testCreateNewDataSourceFor_ShouldOverridesMinPoolConfiguration_WhenConfigured() {
// given
FineractProperties.FineractModeProperties modeProperties = createModeProps(MASTER_DB_AUTO_COMMIT_ENABLED,
MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED);
given(fineractProperties.getMode()).willReturn(modeProperties);
int minPoolSize = 10;
FineractProperties.FineractConfigProperties config = fineractProperties.getTenant().getConfig();
config.setMinPoolSize(minPoolSize);
// when
DataSource dataSource = underTest.createNewDataSourceFor(defaultTenant.getConnection());
// then
assertNotNull(dataSource);
verify(hikariDataSourceFactory).create(hikariConfigCaptor.capture());
HikariConfig hikariConfig = hikariConfigCaptor.getValue();
assertFalse(hikariConfig.isReadOnly());
assertEquals(MASTER_DB_JDBC_URL, hikariConfig.getJdbcUrl());
assertEquals(MASTER_DB_SCHEMA_NAME + "_pool", hikariConfig.getPoolName());
assertEquals(MASTER_DB_USERNAME, hikariConfig.getUsername());
assertEquals(MASTER_DB_PASSWORD, hikariConfig.getPassword());
assertEquals(minPoolSize, hikariConfig.getMinimumIdle());
assertEquals(MASTER_DB_MAX_ACTIVE, hikariConfig.getMaximumPoolSize());
assertEquals(MASTER_DB_VALIDATION_INTERVAL, hikariConfig.getValidationTimeout());
assertEquals(MASTER_DB_DRIVER_CLASS_NAME, hikariConfig.getDriverClassName());
assertEquals(MASTER_DB_CONN_TEST_QUERY, hikariConfig.getConnectionTestQuery());
assertEquals(MASTER_DB_AUTO_COMMIT_ENABLED, hikariConfig.isAutoCommit());
}
@Test
void testCreateNewDataSourceFor_ShouldOverridesMaxPoolConfiguration_WhenConfigured() {
// given
FineractProperties.FineractModeProperties modeProperties = createModeProps(MASTER_DB_AUTO_COMMIT_ENABLED,
MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED);
given(fineractProperties.getMode()).willReturn(modeProperties);
int maxPoolSize = 10;
FineractProperties.FineractConfigProperties config = fineractProperties.getTenant().getConfig();
config.setMaxPoolSize(maxPoolSize);
// when
DataSource dataSource = underTest.createNewDataSourceFor(defaultTenant.getConnection());
// then
assertNotNull(dataSource);
verify(hikariDataSourceFactory).create(hikariConfigCaptor.capture());
HikariConfig hikariConfig = hikariConfigCaptor.getValue();
assertFalse(hikariConfig.isReadOnly());
assertEquals(MASTER_DB_JDBC_URL, hikariConfig.getJdbcUrl());
assertEquals(MASTER_DB_SCHEMA_NAME + "_pool", hikariConfig.getPoolName());
assertEquals(MASTER_DB_USERNAME, hikariConfig.getUsername());
assertEquals(MASTER_DB_PASSWORD, hikariConfig.getPassword());
assertEquals(MASTER_DB_INITIAL_SIZE, hikariConfig.getMinimumIdle());
assertEquals(maxPoolSize, hikariConfig.getMaximumPoolSize());
assertEquals(MASTER_DB_VALIDATION_INTERVAL, hikariConfig.getValidationTimeout());
assertEquals(MASTER_DB_DRIVER_CLASS_NAME, hikariConfig.getDriverClassName());
assertEquals(MASTER_DB_CONN_TEST_QUERY, hikariConfig.getConnectionTestQuery());
assertEquals(MASTER_DB_AUTO_COMMIT_ENABLED, hikariConfig.isAutoCommit());
}
@Test
void testCreateNewDataSourceFor_ShouldOverridesMinAndMaxPoolConfiguration_WhenBothConfigured() {
// given
FineractProperties.FineractModeProperties modeProperties = createModeProps(MASTER_DB_AUTO_COMMIT_ENABLED,
MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED, MASTER_DB_AUTO_COMMIT_ENABLED);
given(fineractProperties.getMode()).willReturn(modeProperties);
int minPoolSize = 10;
int maxPoolSize = 10;
FineractProperties.FineractConfigProperties config = fineractProperties.getTenant().getConfig();
config.setMinPoolSize(minPoolSize);
config.setMaxPoolSize(maxPoolSize);
// when
DataSource dataSource = underTest.createNewDataSourceFor(defaultTenant.getConnection());
// then
assertNotNull(dataSource);
verify(hikariDataSourceFactory).create(hikariConfigCaptor.capture());
HikariConfig hikariConfig = hikariConfigCaptor.getValue();
assertFalse(hikariConfig.isReadOnly());
assertEquals(MASTER_DB_JDBC_URL, hikariConfig.getJdbcUrl());
assertEquals(MASTER_DB_SCHEMA_NAME + "_pool", hikariConfig.getPoolName());
assertEquals(MASTER_DB_USERNAME, hikariConfig.getUsername());
assertEquals(MASTER_DB_PASSWORD, hikariConfig.getPassword());
assertEquals(minPoolSize, hikariConfig.getMinimumIdle());
assertEquals(maxPoolSize, hikariConfig.getMaximumPoolSize());
assertEquals(MASTER_DB_VALIDATION_INTERVAL, hikariConfig.getValidationTimeout());
assertEquals(MASTER_DB_DRIVER_CLASS_NAME, hikariConfig.getDriverClassName());
assertEquals(MASTER_DB_CONN_TEST_QUERY, hikariConfig.getConnectionTestQuery());
assertEquals(MASTER_DB_AUTO_COMMIT_ENABLED, hikariConfig.isAutoCommit());
}
@Test
void testCreateNewDataSourceFor_ShouldUseReadOnlyConfiguration_WhenInReadOnlyMode() {
// given