honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy logging, increase timeout to 120 because clocks

This commit is contained in:
Tadgh 2020-07-03 10:15:57 -07:00
parent a84a41643d
commit d09f410b4d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java
View File

@ -49,10 +49,8 @@ public class BulkExportJobCloser implements Tasklet {
@Override @Override
public RepeatStatus execute(StepContribution theStepContribution, ChunkContext theChunkContext) throws Exception { public RepeatStatus execute(StepContribution theStepContribution, ChunkContext theChunkContext) throws Exception {
if (theChunkContext.getStepContext().getStepExecution().getJobExecution().getStatus() == BatchStatus.STARTED) { if (theChunkContext.getStepContext().getStepExecution().getJobExecution().getStatus() == BatchStatus.STARTED) {
ourLog.warn("Job Closer is setting job to COMPLETE!");
myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.COMPLETE); myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.COMPLETE);
} else { } else {
ourLog.error("Job Closer is setting job to ERROR!");
myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.ERROR); myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.ERROR);
} }
return RepeatStatus.FINISHED; return RepeatStatus.FINISHED;

5
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java
View File

@ -340,10 +340,9 @@ public class BulkDataExportSvcImplR4Test extends BaseJpaR4Test {
//Note that if the job is generated, and doesnt rely on an existed persisted BulkExportJobEntity, it will need to //Note that if the job is generated, and doesnt rely on an existed persisted BulkExportJobEntity, it will need to
//create one itself, which means that its jobUUID isnt known until it starts. to get around this, we move //create one itself, which means that its jobUUID isnt known until it starts. to get around this, we move
public void awaitJobCompletion(JobExecution theJobExecution) throws InterruptedException { public void awaitJobCompletion(JobExecution theJobExecution) throws InterruptedException {
await().atMost(100, TimeUnit.SECONDS).until(() -> { await().atMost(120, TimeUnit.SECONDS).until(() -> {
ourLog.warn("Checking to see if jobExecution {} is finished", theJobExecution.getId());
JobExecution jobExecution = myJobExplorer.getJobExecution(theJobExecution.getId()); JobExecution jobExecution = myJobExplorer.getJobExecution(theJobExecution.getId());
ourLog.warn("That jobExecution currently has status: {}", jobExecution.getStatus()); ourLog.info("JobExecution {} currently has status: {}", theJobExecution.getId(), jobExecution.getStatus());
return jobExecution.getStatus() == BatchStatus.COMPLETED; return jobExecution.getStatus() == BatchStatus.COMPLETED;
}); });
} }