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

Resolve 5818 Update Batch2 framework with GATE_WAITING state #5819

Open
wants to merge 16 commits into
base: 5745-ready-state-batch2
Choose a base branch
from
Open

Resolve 5818 Update Batch2 framework with GATE_WAITING state #5819

wants to merge 16 commits into from
+527 −255

Conversation

TynerGjs
Copy link
Contributor

@TynerGjs TynerGjs commented Apr 3, 2024 •
edited

What was done:

  • Implemented GATE_WAITING state for the batch2 state machine.
  • This will be the initial status for all workchunks of a gated job.
  • made compatible with the equivalent "legacy QUEUED" state in the Old batch2 implementation.
  • Updated corresponding docs.
  • added corresponding tests and changelog

@TynerGjs
- Implemented GATE_WAITING state for the batch2 state machine.
28be0b8 
- 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
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2024 •
edited

Formatting check succeeded!

TipzCM
TipzCM requested changes Apr 3, 2024
View reviewed changes
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_batch/batch2_states.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/introduction.md Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java Outdated Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java Show resolved Hide resolved
...ities/src/main/java/ca/uhn/hapi/fhir/batch2/test/support/JobMaintenanceStateInformation.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/api/IJobPersistence.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
michaelabuckley
michaelabuckley requested changes Apr 3, 2024
View reviewed changes
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java 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-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java Show resolved Hide resolved
@TynerGjs
Merge remote-tracking branch 'origin/5745-ready-state-batch2' into 58…
e8e8648 
…18-update-batch2-framework-with-gate_waiting-state

# Conflicts:
#	hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java
@TynerGjs
Merge remote-tracking branch 'origin/5745-ready-state-batch2' into 58…
1a7e4d4 
…18-update-batch2-framework-with-gate_waiting-state

# Conflicts:
#	hapi-fhir-storage-batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IJobMaintenanceActions.java
#	hapi-fhir-storage-batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IWorkChunkCommon.java
#	hapi-fhir-storage-batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IWorkChunkStateTransitions.java
#	hapi-fhir-storage-batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IWorkChunkStorageTests.java
@TynerGjs
- fix merges conflicts
0aabdbd 
- set first chunk to be always created in READY
@TynerGjs
- have only one path through the equeueReady method
1c1ceb0 
- fixed tests
@TynerGjs
- hid the over-powered transition function behind a proper state action
2518531
@TynerGjs
spotless
d06337d
@TynerGjs
resolved review comments
fd4fdd7
TipzCM
TipzCM requested changes Apr 10, 2024
View reviewed changes
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/server_jpa_batch/batch2_states.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-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java 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 Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Outdated Show resolved Hide resolved
michaelabuckley
michaelabuckley approved these changes Apr 12, 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.

Nice.

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Outdated Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Show resolved Hide resolved
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java Show resolved Hide resolved
...ies/src/main/java/ca/uhn/hapi/fhir/batch2/test/AbstractIJobPersistenceSpecificationTest.java Show resolved Hide resolved
...batch2-test-utilities/src/main/java/ca/uhn/hapi/fhir/batch2/test/IWorkChunkStorageTests.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDataSink.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java Show resolved Hide resolved
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/WorkChunkStatusEnum.java Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TipzCM TipzCM TipzCM requested changes

@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.

None yet
3 participants
@TynerGjs @michaelabuckley @TipzCM