updated

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java

@@ -127,9 +127,7 @@ public class JpaJobPersistenceImpl implements IJobPersistence {
 		ourLog.trace(
 				"Create work chunk data {}/{}: {}", entity.getInstanceId(), entity.getId(), entity.getSerializedData());
 		myTransactionService.withSystemRequestOnDefaultPartition().execute(() -> myWorkChunkRepository.save(entity));
-		System.out.println("==========");
-		System.out.println("Creating workchunk " + entity.getId() + " for " + entity.getTargetStepId() + " in "
-				+ entity.getStatus().name());
+
 		return entity.getId();
 	}
 
@@ -359,9 +357,6 @@ public class JpaJobPersistenceImpl implements IJobPersistence {
 	@Override
 	public void onWorkChunkCompletion(WorkChunkCompletionEvent theEvent) {
 		myTransactionService.withSystemRequestOnDefaultPartition().execute(() -> {
-			System.out.println("xxxxxxxxxxx");
-			System.out.println(
-					"onWorkChunkCompletion " + theEvent.getChunkId() + " " + WorkChunkStatusEnum.COMPLETED.name());
 			myWorkChunkRepository.updateChunkStatusAndClearDataForEndSuccess(
 					theEvent.getChunkId(),
 					new Date(),

hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/PatientReindexTestHelper.java

@@ -56,13 +56,13 @@ public class PatientReindexTestHelper {
 
 	public static Stream<Arguments> numResourcesParams(){
 		return Stream.of(
-//			Arguments.of(0),
-			Arguments.of(1)//,
-//			Arguments.of(499),
-//			Arguments.of(500),
-//			Arguments.of(750),
-//			Arguments.of(1000),
-//			Arguments.of(1001)
+			Arguments.of(0),
+			Arguments.of(1),
+			Arguments.of(499),
+			Arguments.of(500),
+			Arguments.of(750),
+			Arguments.of(1000),
+			Arguments.of(1001)
 		);
 	}
 

hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/maintenance/JobInstanceProcessor.java

@@ -217,11 +217,14 @@ public class JobInstanceProcessor {
 				processChunksForNextGatedSteps(theInstance, theJobDefinition, jobWorkCursor, nextStepId);
 			}
 		} else {
+			String stepId = jobWorkCursor.nextStep != null
+					? jobWorkCursor.nextStep.getStepId()
+					: jobWorkCursor.getCurrentStepId();
 			ourLog.debug(
 					"Not ready to advance gated execution of instance {} from step {} to {}.",
 					instanceId,
 					currentStepId,
-					jobWorkCursor.nextStep.getStepId());
+					stepId);
 		}
 	}