[20/50] [abbrv] hadoop git commit: Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula."

2015-09-07 Thread vvasudev
Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with 
multiple mappers. Contributed by Brahma Reddy Battula."

This reverts commit 75a2560e51387ea31ef4609ef434475bbbc628f7.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/00804e24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/00804e24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/00804e24

Branch: refs/heads/YARN-3926
Commit: 00804e24579083d03a67b86c2c57e70b910dda8d
Parents: 5652131
Author: Akira Ajisaka 
Authored: Wed Sep 2 12:22:16 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 2 12:22:16 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt  |  3 ---
 .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 14 --
 2 files changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 27af9f9..88cca41 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -509,9 +509,6 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6389. Fix BaileyBorweinPlouffe CLI usage message. (Brahma Reddy 
Battula
 via devaraj)
 
-MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple
-mappers. (Brahma Reddy Battula via aajisaka)
-
 MAPREDUCE-6373. The logger reports total input paths but it is referring
 to input files. (Bibin A Chundatt via devaraj)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/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 8a1f1ba..b6c0104 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
@@ -57,8 +57,6 @@ import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
 
 /**
  * This program executes a specified operation that applies load to 
@@ -689,9 +687,6 @@ public class NNBench {
   dataDirName = conf.get("test.nnbench.datadir.name");
   op = conf.get("test.nnbench.operation");
   readFile = conf.getBoolean("test.nnbench.readFileAfterOpen", false);
-  int taskId =
-  TaskAttemptID.forName(conf.get(MRJobConfig.TASK_ATTEMPT_ID))
-  .getTaskID().getId();
   
   long totalTimeTPmS = 0l;
   long startTimeTPmS = 0l;
@@ -704,19 +699,18 @@ public class NNBench {
   successfulFileOps = 0l;
   
   if (barrier()) {
-String filePrefix = "file_" + taskId + "_";
 if (op.equals(OP_CREATE_WRITE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doCreateWriteOp(filePrefix, reporter);
+  doCreateWriteOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_OPEN_READ)) {
   startTimeTPmS = System.currentTimeMillis();
-  doOpenReadOp(filePrefix, reporter);
+  doOpenReadOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_RENAME)) {
   startTimeTPmS = System.currentTimeMillis();
-  doRenameOp(filePrefix, reporter);
+  doRenameOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_DELETE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doDeleteOp(filePrefix, reporter);
+  doDeleteOp("file_" + hostName + "_", reporter);
 }
 
 endTimeTPms = System.currentTimeMillis();



[19/50] [abbrv] hadoop git commit: Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula."

2015-09-04 Thread wangda
Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with 
multiple mappers. Contributed by Brahma Reddy Battula."

This reverts commit 75a2560e51387ea31ef4609ef434475bbbc628f7.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/00804e24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/00804e24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/00804e24

Branch: refs/heads/YARN-1197
Commit: 00804e24579083d03a67b86c2c57e70b910dda8d
Parents: 5652131
Author: Akira Ajisaka 
Authored: Wed Sep 2 12:22:16 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 2 12:22:16 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt  |  3 ---
 .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 14 --
 2 files changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 27af9f9..88cca41 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -509,9 +509,6 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6389. Fix BaileyBorweinPlouffe CLI usage message. (Brahma Reddy 
Battula
 via devaraj)
 
-MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple
-mappers. (Brahma Reddy Battula via aajisaka)
-
 MAPREDUCE-6373. The logger reports total input paths but it is referring
 to input files. (Bibin A Chundatt via devaraj)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/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 8a1f1ba..b6c0104 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
@@ -57,8 +57,6 @@ import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
 
 /**
  * This program executes a specified operation that applies load to 
@@ -689,9 +687,6 @@ public class NNBench {
   dataDirName = conf.get("test.nnbench.datadir.name");
   op = conf.get("test.nnbench.operation");
   readFile = conf.getBoolean("test.nnbench.readFileAfterOpen", false);
-  int taskId =
-  TaskAttemptID.forName(conf.get(MRJobConfig.TASK_ATTEMPT_ID))
-  .getTaskID().getId();
   
   long totalTimeTPmS = 0l;
   long startTimeTPmS = 0l;
@@ -704,19 +699,18 @@ public class NNBench {
   successfulFileOps = 0l;
   
   if (barrier()) {
-String filePrefix = "file_" + taskId + "_";
 if (op.equals(OP_CREATE_WRITE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doCreateWriteOp(filePrefix, reporter);
+  doCreateWriteOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_OPEN_READ)) {
   startTimeTPmS = System.currentTimeMillis();
-  doOpenReadOp(filePrefix, reporter);
+  doOpenReadOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_RENAME)) {
   startTimeTPmS = System.currentTimeMillis();
-  doRenameOp(filePrefix, reporter);
+  doRenameOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_DELETE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doDeleteOp(filePrefix, reporter);
+  doDeleteOp("file_" + hostName + "_", reporter);
 }
 
 endTimeTPms = System.currentTimeMillis();



hadoop git commit: Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula."

2015-09-01 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/trunk 5652131d2 -> 00804e245


Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with 
multiple mappers. Contributed by Brahma Reddy Battula."

This reverts commit 75a2560e51387ea31ef4609ef434475bbbc628f7.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/00804e24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/00804e24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/00804e24

Branch: refs/heads/trunk
Commit: 00804e24579083d03a67b86c2c57e70b910dda8d
Parents: 5652131
Author: Akira Ajisaka 
Authored: Wed Sep 2 12:22:16 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 2 12:22:16 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt  |  3 ---
 .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 14 --
 2 files changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 27af9f9..88cca41 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -509,9 +509,6 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6389. Fix BaileyBorweinPlouffe CLI usage message. (Brahma Reddy 
Battula
 via devaraj)
 
-MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple
-mappers. (Brahma Reddy Battula via aajisaka)
-
 MAPREDUCE-6373. The logger reports total input paths but it is referring
 to input files. (Bibin A Chundatt via devaraj)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/00804e24/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 8a1f1ba..b6c0104 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
@@ -57,8 +57,6 @@ import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
 
 /**
  * This program executes a specified operation that applies load to 
@@ -689,9 +687,6 @@ public class NNBench {
   dataDirName = conf.get("test.nnbench.datadir.name");
   op = conf.get("test.nnbench.operation");
   readFile = conf.getBoolean("test.nnbench.readFileAfterOpen", false);
-  int taskId =
-  TaskAttemptID.forName(conf.get(MRJobConfig.TASK_ATTEMPT_ID))
-  .getTaskID().getId();
   
   long totalTimeTPmS = 0l;
   long startTimeTPmS = 0l;
@@ -704,19 +699,18 @@ public class NNBench {
   successfulFileOps = 0l;
   
   if (barrier()) {
-String filePrefix = "file_" + taskId + "_";
 if (op.equals(OP_CREATE_WRITE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doCreateWriteOp(filePrefix, reporter);
+  doCreateWriteOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_OPEN_READ)) {
   startTimeTPmS = System.currentTimeMillis();
-  doOpenReadOp(filePrefix, reporter);
+  doOpenReadOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_RENAME)) {
   startTimeTPmS = System.currentTimeMillis();
-  doRenameOp(filePrefix, reporter);
+  doRenameOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_DELETE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doDeleteOp(filePrefix, reporter);
+  doDeleteOp("file_" + hostName + "_", reporter);
 }
 
 endTimeTPms = System.currentTimeMillis();



hadoop git commit: Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple mappers. Contributed by Brahma Reddy Battula."

2015-09-01 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 0fb6b6810 -> a61c0f5ca


Revert "MAPREDUCE-6363. [NNBench] Lease mismatch error when running with 
multiple mappers. Contributed by Brahma Reddy Battula."

This reverts commit 98446ee695f922ab079654bbc6d613ab334e371f.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a61c0f5c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a61c0f5c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a61c0f5c

Branch: refs/heads/branch-2
Commit: a61c0f5ca101cff6f1907d029262da5544069897
Parents: 0fb6b68
Author: Akira Ajisaka 
Authored: Wed Sep 2 12:26:25 2015 +0900
Committer: Akira Ajisaka 
Committed: Wed Sep 2 12:26:25 2015 +0900

--
 hadoop-mapreduce-project/CHANGES.txt  |  3 ---
 .../src/test/java/org/apache/hadoop/hdfs/NNBench.java | 14 --
 2 files changed, 4 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a61c0f5c/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 449b03b..3daa740 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -240,9 +240,6 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6389. Fix BaileyBorweinPlouffe CLI usage message. (Brahma Reddy 
Battula
 via devaraj)
 
-MAPREDUCE-6363. [NNBench] Lease mismatch error when running with multiple
-mappers. (Brahma Reddy Battula via aajisaka)
-
 MAPREDUCE-6373. The logger reports total input paths but it is referring
 to input files. (Bibin A Chundatt via devaraj)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a61c0f5c/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 8a1f1ba..b6c0104 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
@@ -57,8 +57,6 @@ import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.Reducer;
-import org.apache.hadoop.mapreduce.MRJobConfig;
-import org.apache.hadoop.mapreduce.TaskAttemptID;
 
 /**
  * This program executes a specified operation that applies load to 
@@ -689,9 +687,6 @@ public class NNBench {
   dataDirName = conf.get("test.nnbench.datadir.name");
   op = conf.get("test.nnbench.operation");
   readFile = conf.getBoolean("test.nnbench.readFileAfterOpen", false);
-  int taskId =
-  TaskAttemptID.forName(conf.get(MRJobConfig.TASK_ATTEMPT_ID))
-  .getTaskID().getId();
   
   long totalTimeTPmS = 0l;
   long startTimeTPmS = 0l;
@@ -704,19 +699,18 @@ public class NNBench {
   successfulFileOps = 0l;
   
   if (barrier()) {
-String filePrefix = "file_" + taskId + "_";
 if (op.equals(OP_CREATE_WRITE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doCreateWriteOp(filePrefix, reporter);
+  doCreateWriteOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_OPEN_READ)) {
   startTimeTPmS = System.currentTimeMillis();
-  doOpenReadOp(filePrefix, reporter);
+  doOpenReadOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_RENAME)) {
   startTimeTPmS = System.currentTimeMillis();
-  doRenameOp(filePrefix, reporter);
+  doRenameOp("file_" + hostName + "_", reporter);
 } else if (op.equals(OP_DELETE)) {
   startTimeTPmS = System.currentTimeMillis();
-  doDeleteOp(filePrefix, reporter);
+  doDeleteOp("file_" + hostName + "_", reporter);
 }
 
 endTimeTPms = System.currentTimeMillis();