From 2e96d9b5ccc8fdbf0081ebb0df8c6a4a81663d34 Mon Sep 17 00:00:00 2001 From: gtully Date: Fri, 5 Oct 2018 12:10:56 +0100 Subject: [PATCH 1/2] ARTEMIS-1684 - don't build the -web module due to the node and gitbook dependency for travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9244f8502c0..e5545434f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: rm -rf $HOME/.m2/repository/org/apache/activemq/artemis-* # use '-Pextra-tests' to ensure extra-tests compiles even though they won't actually run script: - set -e -- mvn -Pfast-tests -Pextra-tests -B install -q +- mvn -Pfast-tests -Pextra-tests -B install -q -pl '!artemis-web' - cd examples - mvn install -Prelease install -B -q From 0963c3fd6bda6f8295c3aeeb15764fa99c6d5822 Mon Sep 17 00:00:00 2001 From: gtully Date: Thu, 4 Oct 2018 16:47:16 +0100 Subject: [PATCH 2/2] 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 --- artemis-jdbc-store/src/main/resources/journal-sql.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artemis-jdbc-store/src/main/resources/journal-sql.properties b/artemis-jdbc-store/src/main/resources/journal-sql.properties index bf758b86ff5..b8877ba2cbe 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