[30/50] [abbrv] hadoop git commit: MAPREDUCE-6350. JobHistory doesn't support fully-functional search. Contributed by Siqi Li.

2015-06-16 Thread arp 
MAPREDUCE-6350. JobHistory doesn't support fully-functional search.
Contributed by Siqi Li.


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

Branch: refs/heads/HDFS-7240
Commit: 6785661e554114a4613b5fe7dabec9bfa80c41d9
Parents: 48ca23d
Author: Devaraj K deva...@apache.org
Authored: Wed Jun 10 12:40:29 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Wed Jun 10 12:40:29 2015 +0530

--
 hadoop-mapreduce-project/CHANGES.txt|  3 +++
 .../jobhistory/JobHistoryEventHandler.java  |  6 -
 .../v2/jobhistory/FileNameIndexUtils.java   | 17 -
 .../mapreduce/v2/jobhistory/JHAdminConfig.java  |  7 ++
 .../v2/jobhistory/TestFileNameIndexUtils.java   | 26 
 .../src/main/resources/mapred-default.xml   |  8 ++
 6 files changed, 60 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 115fc1b..3c1884d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -465,6 +465,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6388. Remove deprecation warnings from JobHistoryServer classes
 (Ray Chiang via ozawa).
 
+MAPREDUCE-6350. JobHistory doesn't support fully-functional search. 
+(Siqi Li via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
index bf32888..35556a6 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal;
 import org.apache.hadoop.mapreduce.v2.jobhistory.FileNameIndexUtils;
+import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobIndexInfo;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -1107,9 +1108,12 @@ public class JobHistoryEventHandler extends 
AbstractService
   if (mi.getHistoryFile() != null) {
 Path historyFile = mi.getHistoryFile();
 Path qualifiedLogFile = stagingDirFS.makeQualified(historyFile);
+int jobNameLimit =
+getConfig().getInt(JHAdminConfig.MR_HS_JOBNAME_LIMIT,
+JHAdminConfig.DEFAULT_MR_HS_JOBNAME_LIMIT);
 String doneJobHistoryFileName =
 getTempFileName(FileNameIndexUtils.getDoneFileName(mi
-.getJobIndexInfo()));
+.getJobIndexInfo(), jobNameLimit));
 qualifiedDoneFile =
 doneDirFS.makeQualified(new Path(doneDirPrefixPath,
 doneJobHistoryFileName));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
index 741da11..eb0c54c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
+++

hadoop git commit: MAPREDUCE-6350. JobHistory doesn't support fully-functional search. Contributed by Siqi Li.

2015-06-10 Thread devaraj 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 48ca23def - 6785661e5


MAPREDUCE-6350. JobHistory doesn't support fully-functional search.
Contributed by Siqi Li.


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

Branch: refs/heads/trunk
Commit: 6785661e554114a4613b5fe7dabec9bfa80c41d9
Parents: 48ca23d
Author: Devaraj K deva...@apache.org
Authored: Wed Jun 10 12:40:29 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Wed Jun 10 12:40:29 2015 +0530

--
 hadoop-mapreduce-project/CHANGES.txt|  3 +++
 .../jobhistory/JobHistoryEventHandler.java  |  6 -
 .../v2/jobhistory/FileNameIndexUtils.java   | 17 -
 .../mapreduce/v2/jobhistory/JHAdminConfig.java  |  7 ++
 .../v2/jobhistory/TestFileNameIndexUtils.java   | 26 
 .../src/main/resources/mapred-default.xml   |  8 ++
 6 files changed, 60 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 115fc1b..3c1884d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -465,6 +465,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6388. Remove deprecation warnings from JobHistoryServer classes
 (Ray Chiang via ozawa).
 
+MAPREDUCE-6350. JobHistory doesn't support fully-functional search. 
+(Siqi Li via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
index bf32888..35556a6 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal;
 import org.apache.hadoop.mapreduce.v2.jobhistory.FileNameIndexUtils;
+import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobIndexInfo;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -1107,9 +1108,12 @@ public class JobHistoryEventHandler extends 
AbstractService
   if (mi.getHistoryFile() != null) {
 Path historyFile = mi.getHistoryFile();
 Path qualifiedLogFile = stagingDirFS.makeQualified(historyFile);
+int jobNameLimit =
+getConfig().getInt(JHAdminConfig.MR_HS_JOBNAME_LIMIT,
+JHAdminConfig.DEFAULT_MR_HS_JOBNAME_LIMIT);
 String doneJobHistoryFileName =
 getTempFileName(FileNameIndexUtils.getDoneFileName(mi
-.getJobIndexInfo()));
+.getJobIndexInfo(), jobNameLimit));
 qualifiedDoneFile =
 doneDirFS.makeQualified(new Path(doneDirPrefixPath,
 doneJobHistoryFileName));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6785661e/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
index 741da11..eb0c54c 100644
---

hadoop git commit: MAPREDUCE-6350. JobHistory doesn't support fully-functional search. Contributed by Siqi Li.

2015-06-10 Thread devaraj 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d21bc811d - 5426e3e92


MAPREDUCE-6350. JobHistory doesn't support fully-functional search.
Contributed by Siqi Li.


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

Branch: refs/heads/branch-2
Commit: 5426e3e92999cb9e923bcd8a0c16e5c70268df5e
Parents: d21bc81
Author: Devaraj K deva...@apache.org
Authored: Wed Jun 10 12:43:31 2015 +0530
Committer: Devaraj K deva...@apache.org
Committed: Wed Jun 10 12:43:31 2015 +0530

--
 hadoop-mapreduce-project/CHANGES.txt|  3 +++
 .../jobhistory/JobHistoryEventHandler.java  |  6 -
 .../v2/jobhistory/FileNameIndexUtils.java   | 17 -
 .../mapreduce/v2/jobhistory/JHAdminConfig.java  |  7 ++
 .../v2/jobhistory/TestFileNameIndexUtils.java   | 26 
 .../src/main/resources/mapred-default.xml   |  8 ++
 6 files changed, 60 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5426e3e9/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 3f9ec14..d2451fc 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -207,6 +207,9 @@ Release 2.8.0 - UNRELEASED
 MAPREDUCE-6388. Remove deprecation warnings from JobHistoryServer classes
 (Ray Chiang via ozawa).
 
+MAPREDUCE-6350. JobHistory doesn't support fully-functional search. 
+(Siqi Li via devaraj)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5426e3e9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
index bf32888..35556a6 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryEventHandler.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.mapreduce.v2.app.job.Job;
 import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal;
 import org.apache.hadoop.mapreduce.v2.jobhistory.FileNameIndexUtils;
+import org.apache.hadoop.mapreduce.v2.jobhistory.JHAdminConfig;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobHistoryUtils;
 import org.apache.hadoop.mapreduce.v2.jobhistory.JobIndexInfo;
 import org.apache.hadoop.security.UserGroupInformation;
@@ -1107,9 +1108,12 @@ public class JobHistoryEventHandler extends 
AbstractService
   if (mi.getHistoryFile() != null) {
 Path historyFile = mi.getHistoryFile();
 Path qualifiedLogFile = stagingDirFS.makeQualified(historyFile);
+int jobNameLimit =
+getConfig().getInt(JHAdminConfig.MR_HS_JOBNAME_LIMIT,
+JHAdminConfig.DEFAULT_MR_HS_JOBNAME_LIMIT);
 String doneJobHistoryFileName =
 getTempFileName(FileNameIndexUtils.getDoneFileName(mi
-.getJobIndexInfo()));
+.getJobIndexInfo(), jobNameLimit));
 qualifiedDoneFile =
 doneDirFS.makeQualified(new Path(doneDirPrefixPath,
 doneJobHistoryFileName));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5426e3e9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/FileNameIndexUtils.java
index 741da11..eb0c54c 100644
---