Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 04cc99152 -> a112c0138


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/a112c013
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a112c013
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a112c013

Branch: refs/heads/branch-2.7
Commit: a112c0138a05e255e8b9dc852c08e13d6d4ea95e
Parents: 04cc991
Author: Akira Ajisaka <[email protected]>
Authored: Wed Mar 23 23:22:43 2016 +0900
Committer: Akira Ajisaka <[email protected]>
Committed: Wed Mar 23 23:26:33 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/a112c013/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 0ea5726..b51fcfc 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -357,6 +357,9 @@ Release 2.6.5 - UNRELEASED
     MAPREDUCE-6635. Unsafe long to int conversion in 
UncompressedSplitLineReader
     and IndexOutOfBoundsException. (Junping Du via vvasudev)
 
+    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/a112c013/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 1468b66..2e6807d 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 + "]");

Reply via email to