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

Fix batch2 intermittent failure #6583

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Fix batch2 intermittent failure #6583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c93fde1
Try to fix intermittent
jamesagnew Jan 3, 2025
ca96729
Spotless
jamesagnew Jan 3, 2025
e20cf87
Add changelog
jamesagnew Jan 3, 2025
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
4 changes: 4 additions & 0 deletions ...ocs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/6583-fix-batch2-intermittent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
type: fix
issue: 6583
title: "When processing a batch2 job under heavy load, a race condition meant that the final reducer step would occasionally fail if it started immediately following a batch2 maintenance task."
11 changes: 9 additions & 2 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,15 @@ public Page<WorkChunkMetadata> fetchAllWorkChunkMetadataForJobInStates(

@Override
public boolean updateInstance(String theInstanceId, JobInstanceUpdateCallback theModifier) {
Batch2JobInstanceEntity instanceEntity =
myEntityManager.find(Batch2JobInstanceEntity.class, theInstanceId, LockModeType.PESSIMISTIC_WRITE);
/*
* We may already have a copy of the entity in the L1 cache, and it may be
* stale if the scheduled maintenance service has touched it recently. So
* we fetch it and then refresh-lock it so that we don't fail if someone
* else has touched it.
*/
Batch2JobInstanceEntity instanceEntity = myEntityManager.find(Batch2JobInstanceEntity.class, theInstanceId);
myEntityManager.refresh(instanceEntity, LockModeType.PESSIMISTIC_WRITE);

if (null == instanceEntity) {
ourLog.error("No instance found with Id {}", theInstanceId);
return false;
Expand Down
Loading