Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 73d77bcd0 -> 6f298b0f7
SENTRY-1398: Fix TestLeaderStatus#testRacingClients time out issue. ( Colin P. McCabe, reviewed by Anne Yu) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/6f298b0f Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/6f298b0f Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/6f298b0f Branch: refs/heads/sentry-ha-redesign Commit: 6f298b0f71efb9c26ee21ea27a514b4ebca02cd8 Parents: 73d77bc Author: Anne Yu <[email protected]> Authored: Thu Jul 14 11:52:36 2016 -0700 Committer: Anne Yu <[email protected]> Committed: Thu Jul 14 11:52:36 2016 -0700 ---------------------------------------------------------------------- .../org/apache/sentry/service/thrift/LeaderStatusAdaptor.java | 2 +- .../java/org/apache/sentry/service/thrift/TestLeaderStatus.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/6f298b0f/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/LeaderStatusAdaptor.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/LeaderStatusAdaptor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/LeaderStatusAdaptor.java index 33a5e7b..e87b3d1 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/LeaderStatusAdaptor.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/LeaderStatusAdaptor.java @@ -194,7 +194,7 @@ final class LeaderStatusAdaptor cond.await(); } } finally { - isActive = false; + deactivate(); LOG.info("LeaderStatusAdaptor: becoming standby"); try { listener.becomeStandby(); http://git-wip-us.apache.org/repos/asf/sentry/blob/6f298b0f/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestLeaderStatus.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestLeaderStatus.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestLeaderStatus.java index 6d408ff..b1c4b31 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestLeaderStatus.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/service/thrift/TestLeaderStatus.java @@ -175,7 +175,7 @@ final public class TestLeaderStatus { } } - @Test(timeout = 60000) + @Test(timeout = 120000) public void testRacingClients() throws Exception { final int NUM_CLIENTS = 3; final Configuration conf = new Configuration(); @@ -189,7 +189,7 @@ final public class TestLeaderStatus { try { contexts.add(new LeaderStatusContext(active, conf)); } catch (Throwable t) { - LOG.error("WATERMELON", t); + LOG.error("error creating LeaderStatusContext", t); throw new RuntimeException(t); } }
