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

5745 ready state batch2 #5764

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

5745 ready state batch2 #5764

wants to merge 51 commits into from
+2,164 −461

Conversation

TipzCM
Copy link
Collaborator

@TipzCM TipzCM commented Mar 6, 2024

closes #5745

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 6, 2024 •
edited

Formatting check succeeded!

michaelabuckley
michaelabuckley requested changes Mar 8, 2024
View reviewed changes
Copy link
Contributor

@michaelabuckley michaelabuckley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks pretty solid. I made a bunch of small suggestions but there is one must-fix, and one path that is too complicated:

  1. We can't fetch the whole chunk in the maintenance loop. Only the id.
  2. The nested internal ifs in the callback are too complicated. Let's figure out how to simplify those.

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_batch/introduction.md Outdated Show resolved Hide resolved
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_batch/introduction.md Outdated Show resolved Hide resolved
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_batch/batch2_states.md Outdated Show resolved Hide resolved
...resources/ca/uhn/hapi/fhir/changelog/7_2_0/5745-added-ready-state-to-batch2-work-chunks.yaml Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
...r-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java Outdated Show resolved Hide resolved
...fhir-storage-batch2/src/test/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImplTest.java Show resolved Hide resolved
@TipzCM TipzCM requested a review from a team as a code owner March 21, 2024 20:40
michaelabuckley
michaelabuckley approved these changes Mar 22, 2024
View reviewed changes
Copy link
Contributor

@michaelabuckley michaelabuckley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No show-stoppers.
I think the new interator class has already been written.
Love the new metadata view. Much more explicit that the old no-data path.

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkMetadataView.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Outdated Show resolved Hide resolved
...2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IWorkChunkErrorActionsTests.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Outdated Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Show resolved Hide resolved
leif stawnyczy and others added 19 commits March 25, 2024 10:36
review fixes
db4ca99
spotless
6ac3c73
review comments 1
4a4be77
more review fixes
6370124
spotless
4be7fa7
fixing bug
e1474c8
fixing path
75b53a7
spotless
5a9b0f3
update state diagram
c8b3388
revert
eb852e0
Merge branch 'master' into 5745-ready-state-batch2
74319a7
@TynerGjs
- Implemented GATE_WAITING state for the batch2 state machine.
32a00f4 
- This will be the initial status for all workchunks of a gated job.
- made compatible with the equivalent "fake QUEUED" state in the Old batch2 implementation.
- Updated corresponding docs.
- added corresponding tests and changelog
@TynerGjs
Revert "- Implemented GATE_WAITING state for the batch2 state machine."
6c5e1a1 
This reverts commit 32a00f4.
fixing a bug
97b00eb
spotless
419d2ae
merging in masters
8d84ed0
fixing
999d6ef
Merge branch 'master' into 5745-ready-state-batch2
e720164
fix test high concurrency
1481d15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelabuckley michaelabuckley michaelabuckley approved these changes

@jamesagnew jamesagnew Awaiting requested review from jamesagnew jamesagnew is a code owner

@tadgh tadgh Awaiting requested review from tadgh tadgh is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update Batch2 framework with READY state
3 participants
@TipzCM @michaelabuckley @TynerGjs