You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/03/22 20:19:45 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1767 JDBC Lock Acquisition
Timeout should behave like the file based version
Repository: activemq-artemis
Updated Branches:
refs/heads/master fae3a8fad -> 7a36e84aa
ARTEMIS-1767 JDBC Lock Acquisition Timeout should behave like the file based version
The JDBC Lock Acquisition Timeout is no longer exposed to any user configuration and defaulted to infinite to match the behaviour of the journal (file-based) one.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b775cb25
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b775cb25
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b775cb25
Branch: refs/heads/master
Commit: b775cb251ffef2aa0c1d3b3019b43738189d0956
Parents: fae3a8f
Author: Francesco Nigro <ni...@gmail.com>
Authored: Thu Mar 22 19:13:49 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Mar 22 16:19:35 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 4 ----
.../activemq/artemis/cli/commands/etc/database-store.txt | 1 -
.../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 -----
6 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b775cb25/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index dfa8c0d..f6d6aaa 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -290,9 +290,6 @@ public class Create extends InputAbstract {
@Option(name = "--jdbc-network-timeout", description = "Network timeout")
long jdbcNetworkTimeout = ActiveMQDefaultConfiguration.getDefaultJdbcNetworkTimeout();
- @Option(name = "--jdbc-lock-acquisition-timeout", description = "Lock acquisition timeout")
- long jdbcLockAcquisitionTimeout = ActiveMQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout();
-
@Option(name = "--jdbc-lock-renew-period", description = "Lock Renew Period")
long jdbcLockRenewPeriod = ActiveMQDefaultConfiguration.getDefaultJdbcLockRenewPeriodMillis();
@@ -623,7 +620,6 @@ public class Create extends InputAbstract {
filters.put("${jdbcURL}", jdbcURL);
filters.put("${jdbcClassName}", jdbcClassName);
filters.put("${jdbcNetworkTimeout}", "" + jdbcNetworkTimeout);
- filters.put("${jdbcLockAcquisitionTimeout}", "" + jdbcLockAcquisitionTimeout);
filters.put("${jdbcLockRenewPeriod}", "" + jdbcLockRenewPeriod);
filters.put("${jdbcLockExpiration}", "" + jdbcLockExpiration);
filters.put("${jdbc}", readTextFile(ETC_DATABASE_STORE_TXT, filters));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b775cb25/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/database-store.txt
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/database-store.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/database-store.txt
index 57197e3..e5107e2 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/database-store.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/database-store.txt
@@ -10,7 +10,6 @@
<bindings-table-name>${jdbcBindings}</bindings-table-name>
<large-message-table-name>${jdbcLargeMessages}</large-message-table-name>
<page-store-table-name>${jdbcPageStore}</page-store-table-name>
- <jdbc-lock-acquisition-timeout>${jdbcLockAcquisitionTimeout}</jdbc-lock-acquisition-timeout>
<jdbc-lock-expiration>${jdbcLockExpiration}</jdbc-lock-expiration>
<jdbc-lock-renew-period>${jdbcLockRenewPeriod}</jdbc-lock-renew-period>
<jdbc-network-timeout>${jdbcNetworkTimeout}</jdbc-network-timeout>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b775cb25/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 87f6dad..875e63a 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 period to wait between connection TTL checks
public static final long DEFAULT_CONNECTION_TTL_CHECK_INTERVAL = 2000;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b775cb25/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 633a716..730b695 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
@@ -1470,7 +1470,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/b775cb25/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 cf586c0..f5948dc 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -1942,13 +1942,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/b775cb25/docs/user-manual/en/persistence.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/persistence.md b/docs/user-manual/en/persistence.md
index e48f785..4abaa2a 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -451,11 +451,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
[2/2] activemq-artemis git commit: This closes #1972
Posted by cl...@apache.org.
This closes #1972
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a36e84a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a36e84a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a36e84a
Branch: refs/heads/master
Commit: 7a36e84aa9ae14525f278a83cb96865f17037f85
Parents: fae3a8f b775cb2
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Mar 22 16:19:36 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Mar 22 16:19:36 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/commands/Create.java | 4 ----
.../activemq/artemis/cli/commands/etc/database-store.txt | 1 -
.../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 -----
6 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------