Repository: oozie Updated Branches: refs/heads/master 90a97694b -> a9fba2cde
OOZIE-3351 [tests] Flaky test TestMemoryLocks#testWriteLockSameThreadNoWait() (pbacsko) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a9fba2cd Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a9fba2cd Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a9fba2cd Branch: refs/heads/master Commit: a9fba2cde933f75335bd70399a6fba1b11af43d3 Parents: 90a9769 Author: Andras Piros <[email protected]> Authored: Mon Sep 24 12:27:58 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Mon Sep 24 12:27:58 2018 +0200 ---------------------------------------------------------------------- core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java | 3 +-- release-log.txt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/a9fba2cd/core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java b/core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java index 1b7bcbd..2c0bd51 100644 --- a/core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java +++ b/core/src/test/java/org/apache/oozie/lock/TestMemoryLocks.java @@ -232,8 +232,6 @@ public class TestMemoryLocks extends XTestCase { MemoryLocks.MemoryLockToken token2 = getLock(); if (token != null) { - coordinator.lockAcquireDone(); - log.info("Got lock [{0}]", nameIndex); sb.append(nameIndex + "-L1 "); if (token2 != null) { @@ -241,6 +239,7 @@ public class TestMemoryLocks extends XTestCase { } sb.append(nameIndex + "-U1 "); + coordinator.lockAcquireDone(); coordinator.awaitContinueSignal(); token.release(); http://git-wip-us.apache.org/repos/asf/oozie/blob/a9fba2cd/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 27ce4d2..bb8702a 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3351 [tests] Flaky test TestMemoryLocks#testWriteLockSameThreadNoWait() (pbacsko) OOZIE-3229 [client] [ui] Improved SLA filtering options (asalamon74, andras.piros) OOZIE-3346 [examples] [action] Fix Git example. PrepareActionsHandler should support XML namespace prefixes (asalamon74, andras.piros) OOZIE-3347 [examples] Fix Fluent Job global example (asalamon74 via andras.piros)
