[1/4] incubator-eagle git commit: [EAGLE-467] Job list apis for querying jobs regardless of the status [Forced Update!]
Repository: incubator-eagle
Updated Branches:
refs/heads/develop a20656b5e -> d6ec142d3 (forced update)
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d6ec142d/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
--
diff --git
a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
index 9f993a6..2accad8 100644
---
a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
+++
b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
@@ -20,12 +20,13 @@ package org.apache.eagle.jpm.mr.running.parser;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.eagle.jpm.mr.running.config.MRRunningConfigManager;
-import org.apache.eagle.jpm.mr.running.entities.JobConfig;
-import org.apache.eagle.jpm.mr.running.entities.JobExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.running.entities.TaskAttemptExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.running.entities.TaskExecutionAPIEntity;
import org.apache.eagle.jpm.mr.running.recover.MRRunningJobManager;
+import org.apache.eagle.jpm.mr.runningentity.JobConfig;
+import org.apache.eagle.jpm.mr.runningentity.JobExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.runningentity.TaskAttemptExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.runningentity.TaskExecutionAPIEntity;
import org.apache.eagle.jpm.util.Constants;
+import org.apache.eagle.jpm.util.JobNameNormalization;
import org.apache.eagle.jpm.util.MRJobTagName;
import org.apache.eagle.jpm.util.Utils;
import org.apache.eagle.jpm.util.resourceFetch.ResourceFetcher;
@@ -118,7 +119,7 @@ public class MRJobParser implements Runnable {
private void finishMRJob(String mrJobId) {
JobExecutionAPIEntity jobExecutionAPIEntity =
mrJobEntityMap.get(mrJobId);
-
jobExecutionAPIEntity.setStatus(Constants.AppState.FINISHED.toString());
+
jobExecutionAPIEntity.setCurrentState(Constants.AppState.FINISHED.toString());
mrJobConfigs.remove(mrJobId);
if (mrJobConfigs.size() == 0) {
this.parserStatus = ParserStatus.APP_FINISHED;
@@ -186,19 +187,20 @@ public class MRJobParser implements Runnable {
mrJobEntityMap.put(id, new JobExecutionAPIEntity());
}
+String jobDefId =
JobNameNormalization.getInstance().normalize(mrJob.getName());
JobExecutionAPIEntity jobExecutionAPIEntity =
mrJobEntityMap.get(id);
jobExecutionAPIEntity.setTags(new HashMap<>(commonTags));
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOB_ID.toString(), id);
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOB_NAME.toString(),
mrJob.getName());
-
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOD_DEF_ID.toString(),
mrJob.getName());
+
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOD_DEF_ID.toString(),
jobDefId);
jobExecutionAPIEntity.setTimestamp(app.getStartedTime());
jobExecutionAPIEntity.setSubmissionTime(app.getStartedTime());
jobExecutionAPIEntity.setStartTime(mrJob.getStartTime());
-jobExecutionAPIEntity.setElapsedTime(mrJob.getElapsedTime());
-jobExecutionAPIEntity.setStatus(mrJob.getState());
-jobExecutionAPIEntity.setMapsTotal(mrJob.getMapsTotal());
+jobExecutionAPIEntity.setDurationTime(mrJob.getElapsedTime());
+jobExecutionAPIEntity.setCurrentState(mrJob.getState());
+jobExecutionAPIEntity.setNumTotalMaps(mrJob.getMapsTotal());
jobExecutionAPIEntity.setMapsCompleted(mrJob.getMapsCompleted());
-jobExecutionAPIEntity.setReducesTotal(mrJob.getReducesTotal());
+jobExecutionAPIEntity.setNumTotalReduces(mrJob.getReducesTotal());
jobExecutionAPIEntity.setReducesCompleted(mrJob.getReducesCompleted());
jobExecutionAPIEntity.setMapProgress(mrJob.getMapProgress());
jobExecutionAPIEntity.setReduceProgress(mrJob.getReduceProgress());
@@ -220,7 +222,6 @@ public class MRJobParser implements Runnable {
jobExecutionAPIEntity.setAllocatedMB(app.getAllocatedMB());
jobExecutionAPIEntity.setAllocatedVCores(app.getAllocatedVCores());
jobExecutionAPIEntity.setRunningContainers(app.getRunningContainers());
-runningJobManager.update(app.getId(), id, jobExecutionAPIEntity);
}
return true;
@@ -434,10 +435,10 @@ public class MRJobParser implements Runnable {
taskExecutionAPIEntity.setTimestamp(app.getStartedTime());
taskExecutionAPIEntity.setStartTime(task.getStartTime());
-
[1/4] incubator-eagle git commit: [EAGLE-467] Job list apis for querying jobs regardless of the status
Repository: incubator-eagle
Updated Branches:
refs/heads/develop acee5cb33 -> a20656b5e
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/a20656b5/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
--
diff --git
a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
index 9f993a6..2accad8 100644
---
a/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
+++
b/eagle-jpm/eagle-jpm-mr-running/src/main/java/org/apache/eagle/jpm/mr/running/parser/MRJobParser.java
@@ -20,12 +20,13 @@ package org.apache.eagle.jpm.mr.running.parser;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.eagle.jpm.mr.running.config.MRRunningConfigManager;
-import org.apache.eagle.jpm.mr.running.entities.JobConfig;
-import org.apache.eagle.jpm.mr.running.entities.JobExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.running.entities.TaskAttemptExecutionAPIEntity;
-import org.apache.eagle.jpm.mr.running.entities.TaskExecutionAPIEntity;
import org.apache.eagle.jpm.mr.running.recover.MRRunningJobManager;
+import org.apache.eagle.jpm.mr.runningentity.JobConfig;
+import org.apache.eagle.jpm.mr.runningentity.JobExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.runningentity.TaskAttemptExecutionAPIEntity;
+import org.apache.eagle.jpm.mr.runningentity.TaskExecutionAPIEntity;
import org.apache.eagle.jpm.util.Constants;
+import org.apache.eagle.jpm.util.JobNameNormalization;
import org.apache.eagle.jpm.util.MRJobTagName;
import org.apache.eagle.jpm.util.Utils;
import org.apache.eagle.jpm.util.resourceFetch.ResourceFetcher;
@@ -118,7 +119,7 @@ public class MRJobParser implements Runnable {
private void finishMRJob(String mrJobId) {
JobExecutionAPIEntity jobExecutionAPIEntity =
mrJobEntityMap.get(mrJobId);
-
jobExecutionAPIEntity.setStatus(Constants.AppState.FINISHED.toString());
+
jobExecutionAPIEntity.setCurrentState(Constants.AppState.FINISHED.toString());
mrJobConfigs.remove(mrJobId);
if (mrJobConfigs.size() == 0) {
this.parserStatus = ParserStatus.APP_FINISHED;
@@ -186,19 +187,20 @@ public class MRJobParser implements Runnable {
mrJobEntityMap.put(id, new JobExecutionAPIEntity());
}
+String jobDefId =
JobNameNormalization.getInstance().normalize(mrJob.getName());
JobExecutionAPIEntity jobExecutionAPIEntity =
mrJobEntityMap.get(id);
jobExecutionAPIEntity.setTags(new HashMap<>(commonTags));
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOB_ID.toString(), id);
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOB_NAME.toString(),
mrJob.getName());
-
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOD_DEF_ID.toString(),
mrJob.getName());
+
jobExecutionAPIEntity.getTags().put(MRJobTagName.JOD_DEF_ID.toString(),
jobDefId);
jobExecutionAPIEntity.setTimestamp(app.getStartedTime());
jobExecutionAPIEntity.setSubmissionTime(app.getStartedTime());
jobExecutionAPIEntity.setStartTime(mrJob.getStartTime());
-jobExecutionAPIEntity.setElapsedTime(mrJob.getElapsedTime());
-jobExecutionAPIEntity.setStatus(mrJob.getState());
-jobExecutionAPIEntity.setMapsTotal(mrJob.getMapsTotal());
+jobExecutionAPIEntity.setDurationTime(mrJob.getElapsedTime());
+jobExecutionAPIEntity.setCurrentState(mrJob.getState());
+jobExecutionAPIEntity.setNumTotalMaps(mrJob.getMapsTotal());
jobExecutionAPIEntity.setMapsCompleted(mrJob.getMapsCompleted());
-jobExecutionAPIEntity.setReducesTotal(mrJob.getReducesTotal());
+jobExecutionAPIEntity.setNumTotalReduces(mrJob.getReducesTotal());
jobExecutionAPIEntity.setReducesCompleted(mrJob.getReducesCompleted());
jobExecutionAPIEntity.setMapProgress(mrJob.getMapProgress());
jobExecutionAPIEntity.setReduceProgress(mrJob.getReduceProgress());
@@ -220,7 +222,6 @@ public class MRJobParser implements Runnable {
jobExecutionAPIEntity.setAllocatedMB(app.getAllocatedMB());
jobExecutionAPIEntity.setAllocatedVCores(app.getAllocatedVCores());
jobExecutionAPIEntity.setRunningContainers(app.getRunningContainers());
-runningJobManager.update(app.getId(), id, jobExecutionAPIEntity);
}
return true;
@@ -434,10 +435,10 @@ public class MRJobParser implements Runnable {
taskExecutionAPIEntity.setTimestamp(app.getStartedTime());
taskExecutionAPIEntity.setStartTime(task.getStartTime());
-
