React code review

submarine-server/server-api/src/main/java/org/apache/submarine/server/api/job/JobLogHandler.java → submarine-server/server-api/src/main/java/org/apache/submarine/server/api/job/JobLog.java

@@ -19,12 +19,25 @@
 
 package org.apache.submarine.server.api.job;
 
-import java.io.InputStream;
+// import java.io.InputStream;
 
-/**
- * Interface for getting logs of job.
- */
-public interface JobLogHandler {
-  String getLog(Job job);
-  InputStream getLogStream(Job job);
+public class JobLog {
+  String podName;
+  String podLog;
+
+  public String getPodName() {
+    return podName;
+  }
+
+  public void setPodName(String name) {
+    podName = name;
+  }
+
+  public String getPodLog() {
+    return podLog;
+  }
+
+  public void setPodLog(String string) {
+    podLog = string;
+  }
 }

submarine-server/server-api/src/main/java/org/apache/submarine/server/api/job/JobSubmitter.java

@@ -19,14 +19,16 @@
 
 package org.apache.submarine.server.api.job;
 
+import java.util.List;
+
 import org.apache.submarine.commons.utils.SubmarineConfiguration;
 import org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
 import org.apache.submarine.server.api.spec.JobSpec;
 
 /**
  * The submitter should implement this interface.
  */
-public interface JobSubmitter extends JobLogHandler {
+public interface JobSubmitter {
   /**
    * Initialize the submitter related code
    */
@@ -70,4 +72,6 @@ public interface JobSubmitter extends JobLogHandler {
    * @throws SubmarineRuntimeException running error
    */
   Job deleteJob(JobSpec jobSpec) throws SubmarineRuntimeException;
+
+  List<JobLog> getJobLog(JobSpec jobSpec) throws SubmarineRuntimeException;
 }

submarine-server/server-core/src/main/java/org/apache/submarine/server/job/JobManager.java

@@ -35,6 +35,7 @@
 import org.apache.submarine.server.api.job.JobSubmitter;
 import org.apache.submarine.server.api.job.Job;
 import org.apache.submarine.server.api.job.JobId;
+import org.apache.submarine.server.api.job.JobLog;
 import org.apache.submarine.server.api.spec.JobSpec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -170,6 +171,23 @@ public Job deleteJob(String id) throws SubmarineRuntimeException {
     return job;
   }
 
+  /**
+   * Get job log
+   * @param id job id
+   * @return object
+   * @throws SubmarineRuntimeException the service error
+   */
+  public List<JobLog> getJobLog(String id) throws SubmarineRuntimeException {
+    checkJobId(id);
+    Job job = cachedJobMap.get(id);
+    JobSpec spec = job.getSpec();
+    JobSubmitter jobSubmitter = getSubmitter(spec.getSubmitterSpec().getType());
+    Job patchJob = jobSubmitter.findJob(spec);
+    job.rebuild(patchJob);
+
+    return jobSubmitter.getJobLog(spec);
+  }
+
   public JobSubmitter getSubmitter(String type) throws SubmarineRuntimeException {
     JobSubmitter submitter = submitterManager.getSubmitterByType(type);
     if (submitter == null) {

submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/JobManagerRestApi.java

@@ -35,6 +35,7 @@
 import org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
 import org.apache.submarine.server.job.JobManager;
 import org.apache.submarine.server.api.job.Job;
+import org.apache.submarine.server.api.job.JobLog;
 import org.apache.submarine.server.api.spec.JobSpec;
 import org.apache.submarine.server.response.JsonResponse;
 
@@ -133,6 +134,33 @@ public Response deleteJob(@PathParam(RestConstants.JOB_ID) String id) {
     }
   }
 
+  /*
+  @GET
+  @Path("/log")
+  public Response listlog(@QueryParam("status") String status) {
+    try {
+      List<Job> jobList = jobManager.listJobsByStatus(status);
+      for (Job job : jobList) {
+        jobManager.getJobLog(job.getName());
+      }
+      return new JsonResponse.Builder<List<Job>>(Response.Status.OK).result(jobList).build();
+    } catch (SubmarineRuntimeException e) {
+      return parseJobServiceException(e);
+    }
+  }
+  */
+
+  @GET
+  @Path("/logs/{id}")
+  public Response getlog(@PathParam(RestConstants.JOB_ID) String id) {
+    try {
+      List<JobLog> jobLogList = jobManager.getJobLog(id);
+      return new JsonResponse.Builder<List<JobLog>>(Response.Status.OK).result(jobLogList).build();
+    } catch (SubmarineRuntimeException e) {
+      return parseJobServiceException(e);
+    }
+  }
+
   private Response parseJobServiceException(SubmarineRuntimeException e) {
     return new JsonResponse.Builder<String>(e.getCode()).message(e.getMessage()).build();
   }