Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Job pause and resume changes #92

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@
import org.onedatashare.transferservice.odstransferservice.service.VfsExpander;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.*;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.launch.JobOperator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand Down Expand Up @@ -48,6 +47,20 @@ public class TransferController {
@Autowired
VfsExpander vfsExpander;

@Autowired
JobExplorer jobExplorer;

@Autowired
JobOperator jobOperator;

Set<Long> jobIds;

Long pausedJobId;

public TransferController(Set<Long> jobIds){
this.jobIds = jobIds;
}

@RequestMapping(value = "/start", method = RequestMethod.POST)
@Async
public ResponseEntity<String> start(@RequestBody TransferJobRequest request) throws Exception {
Expand All @@ -60,7 +73,52 @@ public ResponseEntity<String> start(@RequestBody TransferJobRequest request) thr
jc.setRequest(request);
Job job = jc.concurrentJobDefinition();
JobExecution jobExecution = asyncJobLauncher.run(job, parameters);
this.jobIds.add(jobExecution.getJobId());
return ResponseEntity.status(HttpStatus.OK).body("Your batch job has been submitted with \n ID: " + jobExecution.getJobId());
}

@RequestMapping(value = "/pause", method = RequestMethod.POST)
@Async
public ResponseEntity<String> pause() throws Exception{
logger.info("Pause Controller Entry point");
Long runningJobId = null;
for(Long jobId : jobIds){
JobExecution jobExecution = jobExplorer.getJobExecution(jobId);
if(jobExecution != null && jobExecution.isRunning()){
runningJobId = jobId;
break;
}
}

if(runningJobId == null){
return ResponseEntity.status(HttpStatus.OK).body("No running job found");
}

pausedJobId = runningJobId;
jobOperator.stop(pausedJobId);

return ResponseEntity.status(HttpStatus.OK).body("Your batch job with id "+runningJobId+"has been paused");
}

@RequestMapping(value = "/resume", method = RequestMethod.POST)
@Async
public ResponseEntity<String> resume() throws Exception{
logger.info("Pause Controller Entry point");
if(pausedJobId == null){
return ResponseEntity.status(HttpStatus.OK).body("No paused job found");
}

JobExecution jobExecution = jobExplorer.getJobExecution(pausedJobId);
if(jobExecution == null || !(jobExecution.getStatus().equals(BatchStatus.STOPPING) || jobExecution.getStatus().equals(BatchStatus.STOPPED))){
return ResponseEntity.status(HttpStatus.OK).body("No paused job found with "+pausedJobId+" jobId");
}

jobOperator.restart(pausedJobId);

Long resumedJobId = pausedJobId;
pausedJobId = null;
return ResponseEntity.status(HttpStatus.OK).body("Your batch job with id "+resumedJobId+"has been resumed");
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
@SpringBootTest
class OdsTransferServiceApplicationTests {

@Test
void contextLoads() {
}
@Test
void contextLoads() {
}

}
}