Repository: hadoop Updated Branches: refs/heads/branch-2 1f28703d9 -> 9a8d09dad refs/heads/trunk 447764374 -> 08024d1b0
HDFS-9073. Fix failures in TestLazyPersistLockedMemory testReleaseOnEviction(). (J.Andreina via stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a8d09da Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a8d09da Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a8d09da Branch: refs/heads/branch-2 Commit: 9a8d09dada4d6c1b903bcf8adec9a94e43f4428f Parents: 1f28703 Author: Steve Loughran <[email protected]> Authored: Wed Sep 16 10:11:59 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Sep 16 10:11:59 2015 +0100 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a8d09da/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index c5f83f5..d055160 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1008,6 +1008,9 @@ Release 2.8.0 - UNRELEASED HDFS-9072. Fix random failures in TestJMXGet. (J.Andreina via stevel) + HDFS-9073. Fix failures in TestLazyPersistLockedMemory + testReleaseOnEviction(). (J.Andreina via stevel) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a8d09da/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java index 6c49de5..9155344 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/LazyPersistTestCase.java @@ -480,6 +480,7 @@ public abstract class LazyPersistTestCase { protected final void verifyRamDiskJMXMetric(String metricName, long expectedValue) throws Exception { + waitForMetric(metricName, (int)expectedValue); assertEquals(expectedValue, Integer.parseInt(jmx.getValue(metricName))); }
