Repository: hadoop Updated Branches: refs/heads/branch-2 d6e4c1065 -> 8d256c56d refs/heads/trunk f83c55a6b -> a00e001a1
HDFS-8247. TestDiskspaceQuotaUpdate#testAppendOverTypeQuota is failing. Contributed by Xiaoyu Yao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a00e001a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a00e001a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a00e001a Branch: refs/heads/trunk Commit: a00e001a1a9fa2c6287b2f078e425e9bb157e5ca Parents: f83c55a Author: cnauroth <cnaur...@apache.org> Authored: Sat Apr 25 11:37:27 2015 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Sat Apr 25 11:37:27 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a00e001a/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 07c5151..c1aac54 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -566,6 +566,9 @@ Release 2.8.0 - UNRELEASED HDFS-8211. DataNode UUID is always null in the JMX counter. (Anu Engineer via Arpit Agarwal) + HDFS-8247. TestDiskspaceQuotaUpdate#testAppendOverTypeQuota is failing. + (Xiaoyu Yao via cnauroth) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a00e001a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java index 15ba15e..184cd87 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.client.HdfsDataOutputStream; import org.apache.hadoop.hdfs.protocol.DSQuotaExceededException; import org.apache.hadoop.hdfs.protocol.HdfsConstants; +import org.apache.hadoop.hdfs.protocol.QuotaByStorageTypeExceededException; import org.apache.hadoop.ipc.RemoteException; import org.junit.After; import org.junit.Assert; @@ -250,8 +251,8 @@ public class TestDiskspaceQuotaUpdate { try { DFSTestUtil.appendFile(dfs, file, BLOCKSIZE); Assert.fail("append didn't fail"); - } catch (RemoteException e) { - assertTrue(e.getClassName().contains("QuotaByStorageTypeExceededException")); + } catch (QuotaByStorageTypeExceededException e) { + //ignore } // check that the file exists, isn't UC, and has no dangling lease
