Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3324

This commit is contained in:
franz1981 2020-10-30 17:57:28 +01:00
parent 10debc3478 e4a2a20c22
commit 8bf8bbaf77
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/storage/DatabaseStorageConfiguration.java
View File

@ -152,19 +152,32 @@ public class DatabaseStorageConfiguration implements StoreConfiguration {
private DataSource getDataSource() {
if (dataSource == null) {
// the next settings are going to be applied only if the datasource is the default one
if (dataSourceProperties.isEmpty() && ActiveMQDefaultConfiguration.getDefaultDataSourceClassName().equals(dataSourceClassName)) {
addDataSourceProperty("driverClassName", jdbcDriverClassName);
addDataSourceProperty("url", jdbcConnectionUrl);
if (jdbcUser != null) {
addDataSourceProperty("username", jdbcUser);
if (ActiveMQDefaultConfiguration.getDefaultDataSourceClassName().equals(dataSourceClassName)) {
// these default settings will be applied only if a custom configuration won't override them
if (!dataSourceProperties.containsKey("driverClassName")) {
addDataSourceProperty("driverClassName", jdbcDriverClassName);
}
if (jdbcPassword != null) {
addDataSourceProperty("password", jdbcPassword);
if (!dataSourceProperties.containsKey("url")) {
addDataSourceProperty("url", jdbcConnectionUrl);
}
if (!dataSourceProperties.containsKey("username")) {
if (jdbcUser != null) {
addDataSourceProperty("username", jdbcUser);
}
}
if (!dataSourceProperties.containsKey("password")) {
if (jdbcPassword != null) {
addDataSourceProperty("password", jdbcPassword);
}
}
if (!dataSourceProperties.containsKey("maxTotal")) {
// Let the pool to have unbounded number of connections by default to prevent connection starvation
addDataSourceProperty("maxTotal", "-1");
}
if (!dataSourceProperties.containsKey("poolPreparedStatements")) {
// Let the pool to have unbounded number of cached prepared statements to save the initialization cost
addDataSourceProperty("poolPreparedStatements", "true");
}
// Let the pool to have unbounded number of connections by default to prevent connection starvation
addDataSourceProperty("maxTotal", "-1");
// Let the pool to have unbounded number of cached prepared statements to save the initialization cost
addDataSourceProperty("poolPreparedStatements", "true");
}
dataSource = JDBCDataSourceUtils.getDataSource(dataSourceClassName, dataSourceProperties);
}

9
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/jdbc/JdbcLeaseLock.java
View File

@ -77,10 +77,13 @@ final class JdbcLeaseLock implements LeaseLock {
this.connectionProvider = connectionProvider;
this.lockName = lockName;
this.localExpirationTime = -1;
int expectedTimeout = (int) (queryTimeoutMillis > 0 ? TimeUnit.MILLISECONDS.toSeconds(queryTimeoutMillis) : -1);
int expectedTimeout = -1;
if (queryTimeoutMillis >= 0) {
LOGGER.warn("queryTimeoutMillis is too low: it's suggested to configure a multi-seconds value. Disabling it because too low.");
expectedTimeout = -1;
expectedTimeout = (int) TimeUnit.MILLISECONDS.toSeconds(queryTimeoutMillis);
if (expectedTimeout <= 0) {
LOGGER.warn("queryTimeoutMillis is too low: it's suggested to configure a multi-seconds value. Disabling it because too low.");
expectedTimeout = -1;
}
}
this.queryTimeout = expectedTimeout;