Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 7302122d8 -> d7042f69f
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 (cherry picked from commit 30c88fc679a09e1a1cec093582e855dfd111eac8) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d7042f69 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d7042f69 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d7042f69 Branch: refs/heads/2.6.x Commit: d7042f69ffbaf6f0837fccdc6239dfaff0f8ac6f Parents: 7302122 Author: gtully <[email protected]> Authored: Thu Oct 4 16:47:16 2018 +0100 Committer: Clebert Suconic <[email protected]> Committed: Thu Oct 11 17:09:06 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/d7042f69/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 eb7a5a4..45fe857 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
