Repository: hadoop Updated Branches: refs/heads/branch-2.6 77deb15c1 -> 160a8c74d
MAPREDUCE-6656. [NNBench] OP_DELETE operation isn't working after MAPREDUCE-6363. Contributed by J.Andreina. (cherry picked from commit 368c77376a3704e3fa395d72b1816d388b5cd782) (cherry picked from commit 7a3fd1bc1a2ce93100b6887a97733e262b5e1d56) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/160a8c74 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/160a8c74 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/160a8c74 Branch: refs/heads/branch-2.6 Commit: 160a8c74dfc92d11c2ec06699289f604db20faf0 Parents: 77deb15 Author: Akira Ajisaka <[email protected]> Authored: Wed Mar 23 23:22:43 2016 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Wed Mar 23 23:28:12 2016 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/160a8c74/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 6f920ee..7260470 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -24,6 +24,9 @@ Release 2.6.5 - UNRELEASED MAPREDUCE-6622. Add capability to set JHS job cache to a task-based limit (rchiang via rkanter) + MAPREDUCE-6656. [NNBench] OP_DELETE operation isn't working after + MAPREDUCE-6363. (J.Andreina via aajisaka) + Release 2.6.4 - 2016-02-11 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/160a8c74/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java index a50865a..242a408 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/hdfs/NNBench.java @@ -712,6 +712,7 @@ public class NNBench { doRenameOp(fileName, reporter); } else if (op.equals(OP_DELETE)) { startTimeTPmS = System.currentTimeMillis(); + doDeleteOp(fileName, reporter); } else { throw new IllegalArgumentException( "unsupported operation [" + op + "]");
