Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0543A9737 for ; Tue, 16 Dec 2014 13:38:53 +0000 (UTC) Received: (qmail 21628 invoked by uid 500); 16 Dec 2014 13:38:52 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 21581 invoked by uid 500); 16 Dec 2014 13:38:52 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 21572 invoked by uid 99); 16 Dec 2014 13:38:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 13:38:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 77604A2C473; Tue, 16 Dec 2014 13:38:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: <10383e209a5f426f8ba68246f8dfaee8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: fix intermittent failure of LeaseDatabaseLockerTest and fix log messge with lease expiry time Date: Tue, 16 Dec 2014 13:38:52 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk fc3bb5c65 -> f57fd7daa fix intermittent failure of LeaseDatabaseLockerTest and fix log messge with lease expiry time Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f57fd7da Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f57fd7da Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f57fd7da Branch: refs/heads/trunk Commit: f57fd7daad85fc72e1b5a86ab45199aea462a53e Parents: fc3bb5c Author: gtully Authored: Tue Dec 16 13:35:04 2014 +0000 Committer: gtully Committed: Tue Dec 16 13:38:05 2014 +0000 ---------------------------------------------------------------------- .../java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java | 2 +- .../org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f57fd7da/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java ---------------------------------------------------------------------- diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java index 502c25c..9dce47e 100644 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java @@ -105,7 +105,7 @@ public class LeaseDatabaseLocker extends AbstractJDBCLocker { throw new RuntimeException(getLeaseHolderId() + " failing lease acquire due to stop"); } - LOG.info(getLeaseHolderId() + ", becoming master with lease expiry " + new Date(now) + " on dataSource: " + dataSource); + LOG.info(getLeaseHolderId() + ", becoming master with lease expiry " + new Date(now + lockAcquireSleepInterval) + " on dataSource: " + dataSource); } private void reportLeasOwnerShipAndDuration(Connection connection) throws SQLException { http://git-wip-us.apache.org/repos/asf/activemq/blob/f57fd7da/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java index b499611..774d172 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/LeaseDatabaseLockerTest.java @@ -108,7 +108,7 @@ public class LeaseDatabaseLockerTest { } }); - TimeUnit.MILLISECONDS.sleep(lockerB.getLockAcquireSleepInterval()); + TimeUnit.MILLISECONDS.sleep(lockerB.getLockAcquireSleepInterval() / 2); assertTrue("B is blocked", blocked.get()); assertTrue("A is good", lockerA.keepAlive()); @@ -129,6 +129,7 @@ public class LeaseDatabaseLockerTest { // build a fake lock final String fakeId = "Anon"; final Connection connection = dataSource.getConnection(); + printLockTable(connection); PreparedStatement statement = connection.prepareStatement(jdbc.getStatements().getLeaseObtainStatement()); final long now = System.currentTimeMillis();