Merge pull request #1780 from alliance-genome/SCRUM-2726

Added forced stopped job status
alliance-genome · Jan 6, 2025 · cdea6b2 · cdea6b2
2 parents 55f4c59 + 316baa3
commit cdea6b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/org/alliancegenome/curation_api/enums/JobStatus.java b/src/main/java/org/alliancegenome/curation_api/enums/JobStatus.java
@@ -4,11 +4,11 @@ public enum JobStatus {
 
 	SCHEDULED_PENDING, SCHEDULED_STARTED, SCHEDULED_RUNNING,
 
-	FORCED_PENDING, FORCED_STARTED, FORCED_RUNNING,
+	FORCED_PENDING, FORCED_STARTED, FORCED_RUNNING, FORCED_STOPPED,
 
 	MANUAL_PENDING, MANUAL_STARTED, MANUAL_RUNNING,
 
-	FAILED, STOPPED, FINISHED,
+	FAILED, STOPPED, FINISHED
 
 	;
 
@@ -25,7 +25,7 @@ public boolean isStarted() {
 	}
 
 	public boolean isNotRunning() {
-		return this == FAILED || this == STOPPED || this == FINISHED;
+		return this == FAILED || this == STOPPED || this == FINISHED || this == FORCED_STOPPED;
 	}
 
 	public JobStatus getNextStatus() {
@@ -54,6 +54,6 @@ public JobStatus getNextStatus() {
 	}
 
 	public boolean isForced() {
-		return this == FORCED_PENDING || this == FORCED_STARTED || this == FORCED_RUNNING;
+		return this == FORCED_PENDING || this == FORCED_STARTED || this == FORCED_RUNNING || this == FORCED_STOPPED;
 	}
 }
diff --git a/src/main/java/org/alliancegenome/curation_api/jobs/executors/LoadFileExecutor.java b/src/main/java/org/alliancegenome/curation_api/jobs/executors/LoadFileExecutor.java
@@ -218,6 +218,9 @@ protected <E extends AuditedObject, T extends BaseDTO> boolean runLoad(BaseUpser
 	}
 
 	protected <E extends AuditedObject, T extends BaseDTO> boolean runLoad(BaseUpsertServiceInterface<E, T> service, BulkLoadFileHistory history, BackendBulkDataProvider dataProvider, List<T> objectList, List<Long> idsAdded, Boolean terminateFailing, String countType, String dataType) {
+		if (Thread.currentThread().isInterrupted()) {
+			return false;
+		}
 		ProcessDisplayHelper ph = new ProcessDisplayHelper();
 		ph.addDisplayHandler(loadProcessDisplayService);
 		if (CollectionUtils.isNotEmpty(objectList)) {
@@ -256,6 +259,7 @@ protected <E extends AuditedObject, T extends BaseDTO> boolean runLoad(BaseUpser
 				}
 				ph.progressProcess();
 				if (Thread.currentThread().isInterrupted()) {
+					history.setBulkloadStatus(JobStatus.FORCED_STOPPED);
 					Log.info("Thread Interrupted:");
 					break;
 				}
@@ -273,6 +277,9 @@ protected <E extends AuditedObject, T extends BaseDTO> boolean runLoad(BaseUpser
 
 	// The following methods are for bulk validation
 	protected <S extends BaseEntityCrudService<?, ?>> void runCleanup(S service, BulkLoadFileHistory history, String dataProviderName, List<Long> annotationIdsBefore, List<Long> annotationIdsAfter, String loadTypeString, Boolean deprecate) {
+		if (Thread.currentThread().isInterrupted()) {
+			return;
+		}
 		Log.debug("runLoad: After: " + dataProviderName + " " + annotationIdsAfter.size());
 
 		List<Long> distinctAfter = annotationIdsAfter.stream().distinct().collect(Collectors.toList());
@@ -307,6 +314,7 @@ protected <E extends AuditedObject, T extends BaseDTO> boolean runLoad(BaseUpser
 			}
 			ph.progressProcess();
 			if (Thread.currentThread().isInterrupted()) {
+				history.setBulkloadStatus(JobStatus.FORCED_STOPPED);
 				Log.info("Thread Interrupted:");
 				break;
 			}