hadoop git commit: MAPREDUCE-6259. IllegalArgumentException due to missing job submit time. Contributed by zhihai xu
Repository: hadoop
Updated Branches:
refs/heads/trunk 3fe79e1db - bf70c5ae2
MAPREDUCE-6259. IllegalArgumentException due to missing job submit time.
Contributed by zhihai xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf70c5ae
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf70c5ae
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf70c5ae
Branch: refs/heads/trunk
Commit: bf70c5ae2824a9139c1aa9d7c14020018881cec2
Parents: 3fe79e1
Author: Jason Lowe jl...@apache.org
Authored: Mon May 4 20:39:18 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Mon May 4 20:39:18 2015 +
--
hadoop-mapreduce-project/CHANGES.txt| 3 ++
.../jobhistory/JobHistoryEventHandler.java | 15 --
.../hadoop/mapreduce/v2/app/MRAppMaster.java| 4 +-
.../jobhistory/TestJobHistoryEventHandler.java | 57 +---
.../mapreduce/jobhistory/AMStartedEvent.java| 16 --
5 files changed, 77 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf70c5ae/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index f7e3bde..481757a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -397,6 +397,9 @@ Release 2.7.1 - UNRELEASED
MAPREDUCE-6339. Job history file is not flushed correctly because
isTimerActive
flag is not set true when flushTimerTask is scheduled. (zhihai xu via
devaraj)
+MAPREDUCE-6259. IllegalArgumentException due to missing job submit time
+(zhihai xu via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf70c5ae/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 6b0ea79..bf32888 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
@@ -426,10 +426,10 @@ public class JobHistoryEventHandler extends
AbstractService
* This should be the first call to history for a job
*
* @param jobId the jobId.
- * @param forcedJobStateOnShutDown
+ * @param amStartedEvent
* @throws IOException
*/
- protected void setupEventWriter(JobId jobId, String forcedJobStateOnShutDown)
+ protected void setupEventWriter(JobId jobId, AMStartedEvent amStartedEvent)
throws IOException {
if (stagingDirPath == null) {
LOG.error(Log Directory is null, returning);
@@ -489,8 +489,13 @@ public class JobHistoryEventHandler extends AbstractService
}
MetaInfo fi = new MetaInfo(historyFile, logDirConfPath, writer,
-user, jobName, jobId, forcedJobStateOnShutDown, queueName);
+user, jobName, jobId, amStartedEvent.getForcedJobStateOnShutDown(),
+queueName);
fi.getJobSummary().setJobId(jobId);
+fi.getJobSummary().setJobLaunchTime(amStartedEvent.getStartTime());
+fi.getJobSummary().setJobSubmitTime(amStartedEvent.getSubmitTime());
+fi.getJobIndexInfo().setJobStartTime(amStartedEvent.getStartTime());
+fi.getJobIndexInfo().setSubmitTime(amStartedEvent.getSubmitTime());
fileMap.put(jobId, fi);
}
@@ -541,8 +546,7 @@ public class JobHistoryEventHandler extends AbstractService
try {
AMStartedEvent amStartedEvent =
(AMStartedEvent) event.getHistoryEvent();
- setupEventWriter(event.getJobID(),
- amStartedEvent.getForcedJobStateOnShutDown());
+ setupEventWriter(event.getJobID(), amStartedEvent);
} catch (IOException ioe) {
LOG.error(Error JobHistoryEventHandler in handleEvent: + event,
ioe);
@@ -982,6 +986,7 @@ public class JobHistoryEventHandler extends AbstractService
tEvent.addEventInfo(NODE_MANAGER_HTTP_PORT,
ase.getNodeManagerHttpPort());
tEvent.addEventInfo(START_TIME, ase.getStartTime());
+tEvent.addEventInfo(SUBMIT_TIME, ase.getSubmitTime());
[29/33] hadoop git commit: MAPREDUCE-6259. IllegalArgumentException due to missing job submit time. Contributed by zhihai xu
MAPREDUCE-6259. IllegalArgumentException due to missing job submit time.
Contributed by zhihai xu
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf70c5ae
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf70c5ae
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf70c5ae
Branch: refs/heads/HDFS-7240
Commit: bf70c5ae2824a9139c1aa9d7c14020018881cec2
Parents: 3fe79e1
Author: Jason Lowe jl...@apache.org
Authored: Mon May 4 20:39:18 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Mon May 4 20:39:18 2015 +
--
hadoop-mapreduce-project/CHANGES.txt| 3 ++
.../jobhistory/JobHistoryEventHandler.java | 15 --
.../hadoop/mapreduce/v2/app/MRAppMaster.java| 4 +-
.../jobhistory/TestJobHistoryEventHandler.java | 57 +---
.../mapreduce/jobhistory/AMStartedEvent.java| 16 --
5 files changed, 77 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf70c5ae/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index f7e3bde..481757a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -397,6 +397,9 @@ Release 2.7.1 - UNRELEASED
MAPREDUCE-6339. Job history file is not flushed correctly because
isTimerActive
flag is not set true when flushTimerTask is scheduled. (zhihai xu via
devaraj)
+MAPREDUCE-6259. IllegalArgumentException due to missing job submit time
+(zhihai xu via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf70c5ae/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 6b0ea79..bf32888 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
@@ -426,10 +426,10 @@ public class JobHistoryEventHandler extends
AbstractService
* This should be the first call to history for a job
*
* @param jobId the jobId.
- * @param forcedJobStateOnShutDown
+ * @param amStartedEvent
* @throws IOException
*/
- protected void setupEventWriter(JobId jobId, String forcedJobStateOnShutDown)
+ protected void setupEventWriter(JobId jobId, AMStartedEvent amStartedEvent)
throws IOException {
if (stagingDirPath == null) {
LOG.error(Log Directory is null, returning);
@@ -489,8 +489,13 @@ public class JobHistoryEventHandler extends AbstractService
}
MetaInfo fi = new MetaInfo(historyFile, logDirConfPath, writer,
-user, jobName, jobId, forcedJobStateOnShutDown, queueName);
+user, jobName, jobId, amStartedEvent.getForcedJobStateOnShutDown(),
+queueName);
fi.getJobSummary().setJobId(jobId);
+fi.getJobSummary().setJobLaunchTime(amStartedEvent.getStartTime());
+fi.getJobSummary().setJobSubmitTime(amStartedEvent.getSubmitTime());
+fi.getJobIndexInfo().setJobStartTime(amStartedEvent.getStartTime());
+fi.getJobIndexInfo().setSubmitTime(amStartedEvent.getSubmitTime());
fileMap.put(jobId, fi);
}
@@ -541,8 +546,7 @@ public class JobHistoryEventHandler extends AbstractService
try {
AMStartedEvent amStartedEvent =
(AMStartedEvent) event.getHistoryEvent();
- setupEventWriter(event.getJobID(),
- amStartedEvent.getForcedJobStateOnShutDown());
+ setupEventWriter(event.getJobID(), amStartedEvent);
} catch (IOException ioe) {
LOG.error(Error JobHistoryEventHandler in handleEvent: + event,
ioe);
@@ -982,6 +986,7 @@ public class JobHistoryEventHandler extends AbstractService
tEvent.addEventInfo(NODE_MANAGER_HTTP_PORT,
ase.getNodeManagerHttpPort());
tEvent.addEventInfo(START_TIME, ase.getStartTime());
+tEvent.addEventInfo(SUBMIT_TIME, ase.getSubmitTime());
tEntity.addEvent(tEvent);
hadoop git commit: MAPREDUCE-6259. IllegalArgumentException due to missing job submit time. Contributed by zhihai xu (cherry picked from commit bf70c5ae2824a9139c1aa9d7c14020018881cec2)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 8efcf5bdb - 81f128f29
MAPREDUCE-6259. IllegalArgumentException due to missing job submit time.
Contributed by zhihai xu
(cherry picked from commit bf70c5ae2824a9139c1aa9d7c14020018881cec2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/81f128f2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/81f128f2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/81f128f2
Branch: refs/heads/branch-2
Commit: 81f128f293ad12f154e66776fa3ce2af929523d2
Parents: 8efcf5b
Author: Jason Lowe jl...@apache.org
Authored: Mon May 4 20:39:18 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Mon May 4 20:40:16 2015 +
--
hadoop-mapreduce-project/CHANGES.txt| 3 ++
.../jobhistory/JobHistoryEventHandler.java | 15 --
.../hadoop/mapreduce/v2/app/MRAppMaster.java| 4 +-
.../jobhistory/TestJobHistoryEventHandler.java | 57 +---
.../mapreduce/jobhistory/AMStartedEvent.java| 16 --
5 files changed, 77 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/81f128f2/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index a7893d6..5d605a7 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -145,6 +145,9 @@ Release 2.7.1 - UNRELEASED
MAPREDUCE-6339. Job history file is not flushed correctly because
isTimerActive
flag is not set true when flushTimerTask is scheduled. (zhihai xu via
devaraj)
+MAPREDUCE-6259. IllegalArgumentException due to missing job submit time
+(zhihai xu via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/81f128f2/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 6b0ea79..bf32888 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
@@ -426,10 +426,10 @@ public class JobHistoryEventHandler extends
AbstractService
* This should be the first call to history for a job
*
* @param jobId the jobId.
- * @param forcedJobStateOnShutDown
+ * @param amStartedEvent
* @throws IOException
*/
- protected void setupEventWriter(JobId jobId, String forcedJobStateOnShutDown)
+ protected void setupEventWriter(JobId jobId, AMStartedEvent amStartedEvent)
throws IOException {
if (stagingDirPath == null) {
LOG.error(Log Directory is null, returning);
@@ -489,8 +489,13 @@ public class JobHistoryEventHandler extends AbstractService
}
MetaInfo fi = new MetaInfo(historyFile, logDirConfPath, writer,
-user, jobName, jobId, forcedJobStateOnShutDown, queueName);
+user, jobName, jobId, amStartedEvent.getForcedJobStateOnShutDown(),
+queueName);
fi.getJobSummary().setJobId(jobId);
+fi.getJobSummary().setJobLaunchTime(amStartedEvent.getStartTime());
+fi.getJobSummary().setJobSubmitTime(amStartedEvent.getSubmitTime());
+fi.getJobIndexInfo().setJobStartTime(amStartedEvent.getStartTime());
+fi.getJobIndexInfo().setSubmitTime(amStartedEvent.getSubmitTime());
fileMap.put(jobId, fi);
}
@@ -541,8 +546,7 @@ public class JobHistoryEventHandler extends AbstractService
try {
AMStartedEvent amStartedEvent =
(AMStartedEvent) event.getHistoryEvent();
- setupEventWriter(event.getJobID(),
- amStartedEvent.getForcedJobStateOnShutDown());
+ setupEventWriter(event.getJobID(), amStartedEvent);
} catch (IOException ioe) {
LOG.error(Error JobHistoryEventHandler in handleEvent: + event,
ioe);
@@ -982,6 +986,7 @@ public class JobHistoryEventHandler extends AbstractService
tEvent.addEventInfo(NODE_MANAGER_HTTP_PORT,
ase.getNodeManagerHttpPort());
tEvent.addEventInfo(START_TIME,
hadoop git commit: MAPREDUCE-6259. IllegalArgumentException due to missing job submit time. Contributed by zhihai xu (cherry picked from commit bf70c5ae2824a9139c1aa9d7c14020018881cec2)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 919cbc19e - e7b6a076d
MAPREDUCE-6259. IllegalArgumentException due to missing job submit time.
Contributed by zhihai xu
(cherry picked from commit bf70c5ae2824a9139c1aa9d7c14020018881cec2)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7b6a076
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7b6a076
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7b6a076
Branch: refs/heads/branch-2.7
Commit: e7b6a076dbfac3e2977c9fdc5c5881cec80a2f54
Parents: 919cbc1
Author: Jason Lowe jl...@apache.org
Authored: Mon May 4 20:39:18 2015 +
Committer: Jason Lowe jl...@apache.org
Committed: Mon May 4 20:40:43 2015 +
--
hadoop-mapreduce-project/CHANGES.txt| 3 ++
.../jobhistory/JobHistoryEventHandler.java | 15 --
.../hadoop/mapreduce/v2/app/MRAppMaster.java| 4 +-
.../jobhistory/TestJobHistoryEventHandler.java | 57 +---
.../mapreduce/jobhistory/AMStartedEvent.java| 16 --
5 files changed, 77 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7b6a076/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 11475d6..6ccc9ef 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -29,6 +29,9 @@ Release 2.7.1 - UNRELEASED
MAPREDUCE-6339. Job history file is not flushed correctly because
isTimerActive
flag is not set true when flushTimerTask is scheduled. (zhihai xu via
devaraj)
+MAPREDUCE-6259. IllegalArgumentException due to missing job submit time
+(zhihai xu via jlowe)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7b6a076/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 6b0ea79..bf32888 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
@@ -426,10 +426,10 @@ public class JobHistoryEventHandler extends
AbstractService
* This should be the first call to history for a job
*
* @param jobId the jobId.
- * @param forcedJobStateOnShutDown
+ * @param amStartedEvent
* @throws IOException
*/
- protected void setupEventWriter(JobId jobId, String forcedJobStateOnShutDown)
+ protected void setupEventWriter(JobId jobId, AMStartedEvent amStartedEvent)
throws IOException {
if (stagingDirPath == null) {
LOG.error(Log Directory is null, returning);
@@ -489,8 +489,13 @@ public class JobHistoryEventHandler extends AbstractService
}
MetaInfo fi = new MetaInfo(historyFile, logDirConfPath, writer,
-user, jobName, jobId, forcedJobStateOnShutDown, queueName);
+user, jobName, jobId, amStartedEvent.getForcedJobStateOnShutDown(),
+queueName);
fi.getJobSummary().setJobId(jobId);
+fi.getJobSummary().setJobLaunchTime(amStartedEvent.getStartTime());
+fi.getJobSummary().setJobSubmitTime(amStartedEvent.getSubmitTime());
+fi.getJobIndexInfo().setJobStartTime(amStartedEvent.getStartTime());
+fi.getJobIndexInfo().setSubmitTime(amStartedEvent.getSubmitTime());
fileMap.put(jobId, fi);
}
@@ -541,8 +546,7 @@ public class JobHistoryEventHandler extends AbstractService
try {
AMStartedEvent amStartedEvent =
(AMStartedEvent) event.getHistoryEvent();
- setupEventWriter(event.getJobID(),
- amStartedEvent.getForcedJobStateOnShutDown());
+ setupEventWriter(event.getJobID(), amStartedEvent);
} catch (IOException ioe) {
LOG.error(Error JobHistoryEventHandler in handleEvent: + event,
ioe);
@@ -982,6 +986,7 @@ public class JobHistoryEventHandler extends AbstractService
tEvent.addEventInfo(NODE_MANAGER_HTTP_PORT,
ase.getNodeManagerHttpPort());
tEvent.addEventInfo(START_TIME,
