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

Revert "completed instance will not be sent to the reduction step service" 

This reverts commit aa149b6691.
This commit is contained in:
tyner 2024-04-15 14:24:41 -04:00
parent aa149b6691
commit e18f5796a1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java
View File

@ -100,20 +100,20 @@ public class JobInstanceProcessor {
cleanupInstance(theInstance); cleanupInstance(theInstance);
triggerGatedExecutions(theInstance, jobDefinition); triggerGatedExecutions(theInstance, jobDefinition);
if (theInstance.hasGatedStep() && theInstance.isRunning()) {
JobInstance updatedInstance = JobInstance updatedInstance =
myJobPersistence.fetchInstance(theInstance.getInstanceId()).orElseThrow(); myJobPersistence.fetchInstance(theInstance.getInstanceId()).orElseThrow();
if (theInstance.hasGatedStep()) {
JobWorkCursor<?, ?, ?> jobWorkCursor = JobWorkCursor.fromJobDefinitionAndRequestedStepId( JobWorkCursor<?, ?, ?> jobWorkCursor = JobWorkCursor.fromJobDefinitionAndRequestedStepId(
jobDefinition, updatedInstance.getCurrentGatedStepId()); jobDefinition, updatedInstance.getCurrentGatedStepId());
if (jobWorkCursor.isReductionStep()) { if (jobWorkCursor.isReductionStep()) {
// Reduction step work chunks should never be sent to the queue but to its specific service instead. // Reduction step work chunks should never be sent to the queue but to its specific service instead.
triggerReductionStep(theInstance, jobWorkCursor); triggerReductionStep(updatedInstance, jobWorkCursor);
return; return;
} }
} }
// enqueue the chunks as normal // enqueue the chunks as normal
enqueueReadyChunks(theInstance, jobDefinition); enqueueReadyChunks(updatedInstance, jobDefinition);
ourLog.debug("Finished job processing: {} - {}", myInstanceId, stopWatch); ourLog.debug("Finished job processing: {} - {}", myInstanceId, stopWatch);
} }