From d09f410b4d0491701a00d0b8dc10c4cbacaf9446 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Fri, 3 Jul 2020 10:15:57 -0700 Subject: [PATCH] Tidy logging, increase timeout to 120 because clocks --- .../java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java | 2 -- .../ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java index 3c2fc0e91a7..b86f9df3fb5 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java @@ -49,10 +49,8 @@ public class BulkExportJobCloser implements Tasklet { @Override public RepeatStatus execute(StepContribution theStepContribution, ChunkContext theChunkContext) throws Exception { if (theChunkContext.getStepContext().getStepExecution().getJobExecution().getStatus() == BatchStatus.STARTED) { - ourLog.warn("Job Closer is setting job to COMPLETE!"); myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.COMPLETE); } else { - ourLog.error("Job Closer is setting job to ERROR!"); myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.ERROR); } return RepeatStatus.FINISHED; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java index 65a03ae6d41..da8686ef5df 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java @@ -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 //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 { - await().atMost(100, TimeUnit.SECONDS).until(() -> { - ourLog.warn("Checking to see if jobExecution {} is finished", theJobExecution.getId()); + await().atMost(120, TimeUnit.SECONDS).until(() -> { 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; }); }