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

Attempt backport oldest first #4776

Open
wants to merge 12 commits into
base: ja_2030417_backport_subscription_opt_to_6_4
Choose a base branch
from
Open

Attempt backport oldest first #4776

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
428fb14
Make WorkChunk handling transactional at state transitions. (#4621)
michaelabuckley Mar 12, 2023
670dd74
Cherry pick some pom fixes
tadgh Apr 26, 2023
cc2d6a3
Use java event names for work chunk transitions. (#4658)
michaelabuckley Mar 21, 2023
9e21415
Batch stabilization (#4647)
michaelabuckley Apr 25, 2023
f20206a
Replace system request with a null request
tadgh Apr 26, 2023
bce71da
Fix up processor
tadgh Apr 26, 2023
a581656
Fix up processor
tadgh Apr 26, 2023
70e295c
Fix up processor
tadgh Apr 26, 2023
3100195
Fix intermittent in batch2 tests (#4643)
jamesagnew Mar 13, 2023
263f62b
Resolve fixme
jamesagnew Apr 26, 2023
a06b622
Support `_exportId` for bulk exports. (#4781)
tadgh Apr 27, 2023
d35708b
add import
tadgh May 1, 2023
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
Prev Previous commit
Next Next commit
Replace system request with a null request
  • Loading branch information
@tadgh
tadgh committed Apr 26, 2023
commit f20206ad29f7f941ca883a4ec342ee5cc54f9f26
8 changes: 4 additions & 4 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 @@ -186,7 +186,7 @@ private List<JobInstance> toInstanceList(List<Batch2JobInstanceEntity> theInstan
@Nonnull
public Optional<JobInstance> fetchInstance(String theInstanceId) {
return myTransactionService
.withSystemRequest()
.withRequest(null)
.execute(() -> myJobInstanceRepository.findById(theInstanceId).map(this::toInstance));
}

Expand Down Expand Up @@ -332,7 +332,7 @@ public List<WorkChunk> fetchWorkChunksWithoutData(String theInstanceId, int theP

private void fetchChunks(String theInstanceId, boolean theIncludeData, int thePageSize, int thePageIndex, Consumer<WorkChunk> theConsumer) {
myTransactionService
.withSystemRequest()
.withRequest(null)
.withPropagation(Propagation.REQUIRES_NEW)
.execute(() -> {
List<Batch2WorkChunkEntity> chunks;
Expand All @@ -350,7 +350,7 @@ private void fetchChunks(String theInstanceId, boolean theIncludeData, int thePa
@Override
public List<String> fetchAllChunkIdsForStepWithStatus(String theInstanceId, String theStepId, WorkChunkStatusEnum theStatusEnum) {
return myTransactionService
.withSystemRequest()
.withRequest(null)
.withPropagation(Propagation.REQUIRES_NEW)
.execute(() -> myWorkChunkRepository.fetchAllChunkIdsForStepWithStatus(theInstanceId, theStepId, theStatusEnum));
}
Expand Down Expand Up @@ -422,7 +422,7 @@ public boolean markInstanceAsCompleted(String theInstanceId) {
@Override
public boolean markInstanceAsStatus(String theInstance, StatusEnum theStatusEnum) {
int recordsChanged = myTransactionService
.withSystemRequest()
.withRequest(null)
.execute(()->myJobInstanceRepository.updateInstanceStatus(theInstance, theStatusEnum));
return recordsChanged > 0;
}
Expand Down
2 changes: 1 addition & 1 deletion ...-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobCoordinatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public Batch2JobStartResponse startInstance(JobInstanceStartRequest theStartRequ


IJobPersistence.CreateResult instanceAndFirstChunk =
myTransactionService.withSystemRequest().execute(() ->
myTransactionService.withRequest(null).execute(() ->
myJobPersistence.onCreateWithFirstChunk(jobDefinition, theStartRequest.getParameters()));

JobWorkNotification workNotification = JobWorkNotification.firstStepNotification(jobDefinition, instanceAndFirstChunk.jobInstanceId, instanceAndFirstChunk.workChunkId);
Expand Down
2 changes: 1 addition & 1 deletion ...torage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/WorkChannelMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ private void handleWorkChannelMessage(JobWorkNotificationJsonMessage theMessage)
* Run theCallback in TX, rolling back if the supplied Optional is empty.
*/
<T> Optional<T> executeInTxRollbackWhenEmpty(Supplier<Optional<T>> theCallback) {
return myHapiTransactionService.withSystemRequest()
return myHapiTransactionService.withRequest(null)
.execute(theTransactionStatus -> {

// run the processing
Expand Down