HDFS-9484. NNThroughputBenchmark$BlockReportStats should not send empty block reports. Contributed by Mingliang Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33d4588a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33d4588a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33d4588a Branch: refs/heads/branch-2 Commit: 33d4588a7c57a0945f82fb14d8127d49c9ec68d2 Parents: 3aa73a8 Author: Konstantin V Shvachko <s...@apache.org> Authored: Thu Dec 3 14:51:06 2015 -0800 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Thu Dec 3 14:56:00 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/NNThroughputBenchmark.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/33d4588a/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 3b3d074..c43b2c4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1571,6 +1571,9 @@ Release 2.8.0 - UNRELEASED HDFS-9429. Tests in TestDFSAdminWithHA intermittently fail with EOFException (Xiao Chen via Colin P. McCabe) + HDFS-9484. NNThroughputBenchmark$BlockReportStats should not send empty + block reports. (Mingliang Liu via shv) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/33d4588a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java index 91f9793..8a594ed 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java @@ -925,7 +925,7 @@ public class NNThroughputBenchmark implements Tool { NamespaceInfo nsInfo; DatanodeRegistration dnRegistration; DatanodeStorage storage; //only one storage - final ArrayList<BlockReportReplica> blocks; + final List<BlockReportReplica> blocks; int nrBlocks; // actual number of blocks BlockListAsLongs blockReportList; final int dnIdx; @@ -938,7 +938,7 @@ public class NNThroughputBenchmark implements Tool { TinyDatanode(int dnIdx, int blockCapacity) throws IOException { this.dnIdx = dnIdx; - this.blocks = new ArrayList<BlockReportReplica>(blockCapacity); + this.blocks = Arrays.asList(new BlockReportReplica[blockCapacity]); this.nrBlocks = 0; } @@ -1013,7 +1013,7 @@ public class NNThroughputBenchmark implements Tool { Block block = new Block(blocks.size() - idx, 0, 0); blocks.set(idx, new BlockReportReplica(block)); } - blockReportList = BlockListAsLongs.EMPTY; + blockReportList = BlockListAsLongs.encode(blocks); } BlockListAsLongs getBlockReportList() {
