honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-21 12:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fussing

Browse Source
This commit is contained in:
Michael Buckley 2023-02-10 17:13:25 -05:00
parent d7c7a9047b
commit 047498549b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataErrorAbuseTest.java
View File

@ -117,7 +117,7 @@ public class BulkDataErrorAbuseTest extends BaseResourceProviderR4Test {
verifyBulkExportResults(jobId, List.of("Patient/PING1", "Patient/PING2"), Collections.singletonList("Patient/PNING3")); verifyBulkExportResults(jobId, List.of("Patient/PING1", "Patient/PING2"), Collections.singletonList("Patient/PNING3"));
} catch (Throwable theError) { } catch (Throwable theError) {
ourLog.error("Winner winner! {}", jobId, theError); ourLog.error("Winner winner! {} {}", jobId, theError.getMessage(), theError);
if (myRunningFlag.get()) { if (myRunningFlag.get()) {
// something bad happened // something bad happened
// shutdown the pool // shutdown the pool
@ -147,7 +147,7 @@ public class BulkDataErrorAbuseTest extends BaseResourceProviderR4Test {
String report = myJobRunner.getJobInfo(theJobId).getReport(); String report = myJobRunner.getJobInfo(theJobId).getReport();
ourLog.debug("Export job {} report: {}", theJobId, report); ourLog.debug("Export job {} report: {}", theJobId, report);
if (!theContainedList.isEmpty()) { if (!theContainedList.isEmpty()) {
assertThat(report, not(emptyOrNullString())); assertThat("report not empty", report, not(emptyOrNullString()));
} }
BulkExportJobResults results = JsonUtil.deserialize(report, BulkExportJobResults.class); BulkExportJobResults results = JsonUtil.deserialize(report, BulkExportJobResults.class);
@ -185,10 +185,10 @@ public class BulkDataErrorAbuseTest extends BaseResourceProviderR4Test {
ourLog.debug("Export job {} exported resources {}", theJobId, foundIds); ourLog.debug("Export job {} exported resources {}", theJobId, foundIds);
for (String containedString : theContainedList) { for (String containedString : theContainedList) {
assertThat(foundIds, hasItem(containedString)); assertThat("export has expected ids",foundIds, hasItem(containedString));
} }
for (String excludedString : theExcludedList) { for (String excludedString : theExcludedList) {
assertThat(foundIds, not(hasItem(excludedString))); assertThat("export doesn't have expected ids", foundIds, not(hasItem(excludedString)));
} }
} }

1
hapi-fhir-jpaserver-test-utilities/src/main/resources/logback-test.xml
View File

@ -44,5 +44,6 @@
<logger name="org.hibernate.search.backend.lucene.infostream" level="TRACE"/> --> <logger name="org.hibernate.search.backend.lucene.infostream" level="TRACE"/> -->
<logger name="ca.uhn.fhir.jpa.bulk" level="TRACE"/> <logger name="ca.uhn.fhir.jpa.bulk" level="TRACE"/>
<logger name="ca.uhn.fhir.batch2" level="TRACE"/>
</configuration> </configuration>

2
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobMaintenanceServiceImpl.java
View File

@ -203,6 +203,7 @@ public class JobMaintenanceServiceImpl implements IJobMaintenanceService, IHasSc
} }
private void doMaintenancePass() { private void doMaintenancePass() {
ourLog.debug("doMaintenancePass() - starting");
myMaintenanceJobStartedCallback.run(); myMaintenanceJobStartedCallback.run();
Set<String> processedInstanceIds = new HashSet<>(); Set<String> processedInstanceIds = new HashSet<>();
JobChunkProgressAccumulator progressAccumulator = new JobChunkProgressAccumulator(); JobChunkProgressAccumulator progressAccumulator = new JobChunkProgressAccumulator();
@ -224,6 +225,7 @@ public class JobMaintenanceServiceImpl implements IJobMaintenanceService, IHasSc
} }
} }
myMaintenanceJobFinishedCallback.run(); myMaintenanceJobFinishedCallback.run();
ourLog.debug("doMaintenancePass() - finished");
} }
public void setMaintenanceJobStartedCallback(Runnable theMaintenanceJobStartedCallback) { public void setMaintenanceJobStartedCallback(Runnable theMaintenanceJobStartedCallback) {