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.

Sign up for GitHub

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

Jump to bottom

only fast-track jobs with exactly one chunk #3879

Merged
merged 1 commit into from
Aug 4, 2022
Merged

only fast-track jobs with exactly one chunk #3879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .../src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3878-fast-track-zero-chunk-jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
type: fix
issue: 3878
title: "Previously, if an intermediate step of a gated batch job produced no output data, an exception would be thrown
and processing of the step would abort, leaving the batch job in an unrecoverable state. This has been fixed."
4 changes: 4 additions & 0 deletions hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/BaseDataSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public boolean firstStepProducedNothing() {
return myJobWorkCursor.isFirstStep && getWorkChunkCount() == 0;
}

public boolean hasExactlyOneChunk() {
return getWorkChunkCount() == 1;
}

public JobDefinitionStep<PT,IT,OT> getTargetStep() {
return myJobWorkCursor.currentStep;
}
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobStepExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private void handleGatedExecution(BaseDataSink<PT, IT, OT> theDataSink) {
jobInstance.setJobDefinition(myDefinition);
JobInstanceProgressCalculator calculator = new JobInstanceProgressCalculator(myJobPersistence, jobInstance, new JobChunkProgressAccumulator());
calculator.calculateAndStoreInstanceProgress();
} else {
} else if (theDataSink.hasExactlyOneChunk()) {
JobWorkNotification workNotification = new JobWorkNotification(jobInstance, myCursor.nextStep.getStepId(), ((JobDataSink<PT,IT,OT>) theDataSink).getOnlyChunkId());
myBatchJobSender.sendWorkChannelMessage(workNotification);
}
Expand Down