Repository: falcon Updated Branches: refs/heads/master d8fbec9f9 -> bb659d40b
FALCON-1446 Flaky TaskLogRetrieverYarnTest. Contributed by Narayan Periwal Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/bb659d40 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/bb659d40 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/bb659d40 Branch: refs/heads/master Commit: bb659d40bfde4dce481fdd4f4ff5fd678e6bff88 Parents: d8fbec9 Author: Pallavi Rao <[email protected]> Authored: Tue Sep 15 16:20:27 2015 +0530 Committer: Pallavi Rao <[email protected]> Committed: Tue Sep 15 16:20:27 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/bb659d40/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index be4324c..3a00a1e 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,8 @@ Trunk (Unreleased) OPTIMIZATIONS BUG FIXES + FALCON-1446 Flaky TaskLogRetrieverYarnTest(Narayan Periwal via Pallavi Rao) + FALCON-1443 NPE in shutdown hook(Pallavi Rao via Ajay Yadava) FALCON-1445 Docfix for api/instance/dependencies endpoint(Raghav Kumar Gautam via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/bb659d40/oozie/src/test/java/org/apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java ---------------------------------------------------------------------- diff --git a/oozie/src/test/java/org/apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java b/oozie/src/test/java/org/apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java index 0d9cf12..87a445f 100644 --- a/oozie/src/test/java/org/apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java +++ b/oozie/src/test/java/org/apache/falcon/oozie/logging/TaskLogRetrieverYarnTest.java @@ -56,7 +56,7 @@ public class TaskLogRetrieverYarnTest extends TaskLogRetrieverYarn { for (int count = 0; count < samples; count++) { List<String> expectedResult = new ArrayList<String>(); Cluster cluster = getCluster(getConf()); - String jobId = new JobID("job", random.nextInt(1000)).toString(); + String jobId = new JobID("job", count).toString(); boolean success = random.nextBoolean(); JobID jobID = JobID.forName(jobId); int numEvents = getRandomValueInRange(10) + 1; @@ -77,9 +77,10 @@ public class TaskLogRetrieverYarnTest extends TaskLogRetrieverYarn { } else { when(cluster.getJob(jobID)).thenReturn(null); expectedResult = null; + break; } - resultSet[count] = new Object[]{jobId, expectedResult}; } + resultSet[count] = new Object[]{jobId, expectedResult}; } return resultSet; }
