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/10/10 22:44:52 UTC
[1/2] activemq-artemis git commit: ARTEMIS-2110 allow a lease renew
without update to the expiry timestamp. Fix intermittent failure of
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcLeaseLockTest#shouldRenewAcquiredLock
Repository: activemq-artemis
Updated Branches:
refs/heads/master 61449cfb1 -> 77714b3d6
ARTEMIS-2110 allow a lease renew without update to the expiry timestamp. Fix intermittent failure of org.apache.activemq.artemis.core.server.impl.jdbc.JdbcLeaseLockTest#shouldRenewAcquiredLock
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/30c88fc6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/30c88fc6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/30c88fc6
Branch: refs/heads/master
Commit: 30c88fc679a09e1a1cec093582e855dfd111eac8
Parents: 61449cf
Author: gtully <ga...@gmail.com>
Authored: Thu Oct 4 16:47:16 2018 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 10 18:44:46 2018 -0400
----------------------------------------------------------------------
artemis-jdbc-store/src/main/resources/journal-sql.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30c88fc6/artemis-jdbc-store/src/main/resources/journal-sql.properties
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/resources/journal-sql.properties b/artemis-jdbc-store/src/main/resources/journal-sql.properties
index bf758b8..b8877ba 100644
--- a/artemis-jdbc-store/src/main/resources/journal-sql.properties
+++ b/artemis-jdbc-store/src/main/resources/journal-sql.properties
@@ -41,7 +41,7 @@ create-state=INSERT INTO %s (ID) VALUES (%s)
try-acquire-lock=UPDATE %s SET HOLDER_ID = ?, HOLDER_EXPIRATION_TIME = ? WHERE (HOLDER_EXPIRATION_TIME IS NULL OR (HOLDER_EXPIRATION_TIME < CURRENT_TIMESTAMP AND ? > CURRENT_TIMESTAMP)) AND ID = %s
try-release-lock=UPDATE %s SET HOLDER_ID = NULL, HOLDER_EXPIRATION_TIME = NULL WHERE HOLDER_ID = ? AND ID = %s
is-locked=SELECT HOLDER_ID, HOLDER_EXPIRATION_TIME, CURRENT_TIMESTAMP FROM %s WHERE ID = %s
-renew-lock=UPDATE %s SET HOLDER_EXPIRATION_TIME = ? WHERE HOLDER_ID = ? AND HOLDER_EXPIRATION_TIME IS NOT NULL AND ? > HOLDER_EXPIRATION_TIME AND ? > CURRENT_TIMESTAMP AND ID = %s
+renew-lock=UPDATE %s SET HOLDER_EXPIRATION_TIME = ? WHERE HOLDER_ID = ? AND HOLDER_EXPIRATION_TIME IS NOT NULL AND ? >= HOLDER_EXPIRATION_TIME AND ? > CURRENT_TIMESTAMP AND ID = %s
current-timestamp=SELECT CURRENT_TIMESTAMP FROM %s
write-state=UPDATE %s SET STATE = ? WHERE ID = %s
read-state=SELECT STATE FROM %s WHERE ID = %s
[2/2] activemq-artemis git commit: This closes #2346
Posted by cl...@apache.org.
This closes #2346
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/77714b3d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/77714b3d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/77714b3d
Branch: refs/heads/master
Commit: 77714b3d6617ab6a7563e7bd8117746a0ad6f65b
Parents: 61449cf 30c88fc
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 10 18:44:47 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 10 18:44:47 2018 -0400
----------------------------------------------------------------------
artemis-jdbc-store/src/main/resources/journal-sql.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------