ARTEMIS-1767 JDBC Lock Acquisition Timeout should behave like the file based version
(cherry picked from commit 6e9ce27a6e36454dafa3749139ae96d45f34b380) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a9cfc08e Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a9cfc08e Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a9cfc08e Branch: refs/heads/1.x Commit: a9cfc08e6727bb3f3a628e0dabf4725cb23be753 Parents: 03ff066 Author: Francesco Nigro <[email protected]> Authored: Thu Mar 22 19:13:49 2018 +0100 Committer: Clebert Suconic <[email protected]> Committed: Wed Mar 28 11:54:15 2018 -0400 ---------------------------------------------------------------------- .../artemis/api/config/ActiveMQDefaultConfiguration.java | 2 +- .../artemis/core/deployers/impl/FileConfigurationParser.java | 1 - .../src/main/resources/schema/artemis-configuration.xsd | 7 ------- docs/user-manual/en/persistence.md | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9cfc08e/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java index c9f775e..1920fa8 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java @@ -447,7 +447,7 @@ public final class ActiveMQDefaultConfiguration { private static final long DEFAULT_JDBC_LOCK_EXPIRATION_MILLIS = TimeUnit.SECONDS.toMillis(20); - private static final long DEFAULT_JDBC_LOCK_ACQUISITION_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(60); + private static final long DEFAULT_JDBC_LOCK_ACQUISITION_TIMEOUT_MILLIS = -1; // Default JMS Bingings table name, used with Database storage type private static final String DEFAULT_JMS_BINDINGS_TABLE_NAME = "JMS_BINDINGS"; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9cfc08e/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index e69c486..056ab93 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -1164,7 +1164,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { conf.setJdbcConnectionUrl(getString(storeNode, "jdbc-connection-url", conf.getJdbcConnectionUrl(), Validators.NO_CHECK)); conf.setJdbcDriverClassName(getString(storeNode, "jdbc-driver-class-name", conf.getJdbcDriverClassName(), Validators.NO_CHECK)); conf.setJdbcNetworkTimeout(getInteger(storeNode, "jdbc-network-timeout", conf.getJdbcNetworkTimeout(), Validators.NO_CHECK)); - conf.setJdbcLockAcquisitionTimeoutMillis(getLong(storeNode, "jdbc-lock-acquisition-timeout", conf.getJdbcLockAcquisitionTimeoutMillis(), Validators.NO_CHECK)); conf.setJdbcLockRenewPeriodMillis(getLong(storeNode, "jdbc-lock-renew-period", conf.getJdbcLockRenewPeriodMillis(), Validators.NO_CHECK)); conf.setJdbcLockExpirationMillis(getLong(storeNode, "jdbc-lock-expiration", conf.getJdbcLockExpirationMillis(), Validators.NO_CHECK)); return conf; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9cfc08e/artemis-server/src/main/resources/schema/artemis-configuration.xsd ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd index 81f13bf..760dcb3 100644 --- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd +++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd @@ -1722,13 +1722,6 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="jdbc-lock-acquisition-timeout" type="xsd:int" minOccurs="0" maxOccurs="1"> - <xsd:annotation> - <xsd:documentation> - The max allowed time in milliseconds while trying to acquire a JDBC lock. - </xsd:documentation> - </xsd:annotation> - </xsd:element> <xsd:element name="jdbc-lock-renew-period" type="xsd:int" minOccurs="0" maxOccurs="1"> <xsd:annotation> <xsd:documentation> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a9cfc08e/docs/user-manual/en/persistence.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md index e4cf12f..d35cfdc 100644 --- a/docs/user-manual/en/persistence.md +++ b/docs/user-manual/en/persistence.md @@ -437,11 +437,6 @@ To configure Apache ActiveMQ Artemis to use a database for persisting messages a The JDBC network connection timeout in milliseconds. The default value is 20000 milliseconds (ie 20 seconds). -- `jdbc-lock-acquisition-timeout` - - The max allowed time in milliseconds while trying to acquire a JDBC lock. The default value - is 60000 milliseconds (ie 60 seconds). - - `jdbc-lock-renew-period` The period in milliseconds of the keep alive service of a JDBC lock. The default value
