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

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
Fix up processor
  • Loading branch information
@tadgh
tadgh committed Apr 26, 2023
commit 70e295cb5dd8b5d32391e873c262b68cfe43a65a
21 changes: 12 additions & 9 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
package ca.uhn.fhir.jpa.batch2;

/*-
* #%L
* HAPI FHIR JPA Server
Expand All @@ -19,12 +17,14 @@
* limitations under the License.
* #L%
*/
package ca.uhn.fhir.jpa.batch2;

import ca.uhn.fhir.batch2.api.IJobPersistence;
import ca.uhn.fhir.batch2.config.BaseBatch2Config;
import ca.uhn.fhir.jpa.bulk.export.job.BulkExportJobConfig;
import ca.uhn.fhir.jpa.dao.data.IBatch2JobInstanceRepository;
import ca.uhn.fhir.jpa.dao.data.IBatch2WorkChunkRepository;
import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
import ca.uhn.fhir.system.HapiSystemProperties;
import ca.uhn.fhir.util.ProxyUtil;
import org.springframework.context.annotation.Bean;
Expand All @@ -42,19 +42,22 @@
public class JpaBatch2Config extends BaseBatch2Config {

@Bean
public IJobPersistence batch2JobInstancePersister(IBatch2JobInstanceRepository theJobInstanceRepository, IBatch2WorkChunkRepository theWorkChunkRepository, PlatformTransactionManager theTransactionManager, EntityManager theEntityManager) {
return new JpaJobPersistenceImpl(theJobInstanceRepository, theWorkChunkRepository, theTransactionManager, theEntityManager);
public IJobPersistence batch2JobInstancePersister(IBatch2JobInstanceRepository theJobInstanceRepository, IBatch2WorkChunkRepository theWorkChunkRepository, IHapiTransactionService theTransactionService, EntityManager theEntityManager) {
return new JpaJobPersistenceImpl(theJobInstanceRepository, theWorkChunkRepository, theTransactionService, theEntityManager);
}

@Primary
@Bean
public IJobPersistence batch2JobInstancePersisterWrapper(IBatch2JobInstanceRepository theJobInstanceRepository, IBatch2WorkChunkRepository theWorkChunkRepository, PlatformTransactionManager theTransactionManager, EntityManager theEntityManager) {
IJobPersistence retVal = batch2JobInstancePersister(theJobInstanceRepository, theWorkChunkRepository, theTransactionManager, theEntityManager);
public IJobPersistence batch2JobInstancePersisterWrapper(IBatch2JobInstanceRepository theJobInstanceRepository, IBatch2WorkChunkRepository theWorkChunkRepository, IHapiTransactionService theTransactionService, EntityManager theEntityManager) {
IJobPersistence retVal = batch2JobInstancePersister(theJobInstanceRepository, theWorkChunkRepository, theTransactionService, theEntityManager);
// Avoid H2 synchronization issues caused by
// https://github.com/h2database/h2database/issues/1808
if (HapiSystemProperties.isUnitTestModeEnabled()) {
retVal = ProxyUtil.synchronizedProxy(IJobPersistence.class, retVal);
}
// TODO: Update 2023-03-14 - The bug above appears to be fixed. I'm going to try
// disabing this and see if we can get away without it. If so, we can delete
// this entirely
// if (HapiSystemProperties.isUnitTestModeEnabled()) {
// retVal = ProxyUtil.synchronizedProxy(IJobPersistence.class, retVal);
// }
return retVal;
}

Expand Down