Repository: oozie Updated Branches: refs/heads/master 0c7466788 -> edfa86927
OOZIE-2548 Flaky test TestZKLocksService.testLockReaper Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/edfa8692 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/edfa8692 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/edfa8692 Branch: refs/heads/master Commit: edfa86927a3b0a00957b9ec0b86874d3d197c7f3 Parents: 0c74667 Author: Purshotam Shah <[email protected]> Authored: Thu Jun 2 10:45:28 2016 -0700 Committer: Purshotam Shah <[email protected]> Committed: Thu Jun 2 10:45:28 2016 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/service/TestZKLocksService.java | 13 ++++++++++--- release-log.txt | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/edfa8692/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java b/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java index 70aa4d7..d1acadf 100644 --- a/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java +++ b/core/src/test/java/org/apache/oozie/service/TestZKLocksService.java @@ -489,11 +489,18 @@ public class TestZKLocksService extends ZKXTestCase { for (int i = 0; i < 10; ++i) { LockToken l = zkls.getReadLock(String.valueOf(i), 1); l.release(); - } - sleep(2000); + + waitFor(10000, new Predicate() { + @Override + public boolean evaluate() throws Exception { + Stat stat = getClient().checkExists().forPath(ZKLocksService.LOCKS_NODE); + return stat.getNumChildren() == 0; + } + }); + Stat stat = getClient().checkExists().forPath(ZKLocksService.LOCKS_NODE); - assertEquals(stat.getNumChildren(), 0); + assertEquals(0, stat.getNumChildren()); } finally { zkls.destroy(); http://git-wip-us.apache.org/repos/asf/oozie/blob/edfa8692/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index ef211fb..6ff73d3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2548 Flaky test TestZKLocksService.testLockReaper (pbacsko via puru) OOZIE-2546 Improperly closed resources in OozieDBCLI (pbacsko via rkanter) OOZIE-2476 When one of the action from fork fails with transient error, WF never joins (puru) OOZIE-2475 Oozie does not cleanup action dir of killed actions (satishsaley via rohini)
