Merge branch 'develop'

Author: James Wood

.github/workflows/README.md

@@ -22,13 +22,13 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
 
 - [**Services**](https://docs.github.com/en/actions/using-containerized-services/about-service-containers):
   - MariaDB
-    - Image: mariadb:10.6
+    - Image: mariadb:10.11
     - Ports: 3306:3306
 - [**checkout**](https://github.com/marketplace/actions/checkout): This action checks out the repository under `$GITHUB_WORKSPACE`, so the workflow can access it.
-- Set up JDK 11:
+- Set up JDK 17:
   - [**setup-java**](https://github.com/marketplace/actions/setup-java-jdk): This action downloads and sets up a requested version of Java
   - Current configuration:
-      - Java-version: 11
+      - Java-version: 17
       - Distribution: Temurin
       - Cache: Maven
 - **Create open-source certs**:
@@ -87,7 +87,7 @@ The `publish-cws-image` job is the CD component of the workflow, triggered upon
 - **Check out the repo**:
   - Utilizes the same `checkout` action to check out the repository again
   - This is done in a new GitHub runner
-- **Set up JDK 11**
+- **Set up JDK 17**
   - Utilizes the same `setup-java` action to set up Java
 - **Log in to Docker Hub**:
   - [**Docker Login**](https://github.com/marketplace/actions/docker-login): This action is used to log in against a Docker registry

.github/workflows/camunda.yml

@@ -21,7 +21,7 @@ jobs:
 
     services:
       mdb106:
-        image: mariadb:10.6
+        image: mariadb:10.11
         ports:
           - 3306:3306
         env:
@@ -155,7 +155,7 @@ jobs:
 
     services:
       mdb106:
-        image: mariadb:10.6
+        image: mariadb:10.11
         ports:
           - 3306:3306
         env:

.github/workflows/ldap.yml

@@ -21,7 +21,7 @@ jobs:
 
     services:
       mdb106:
-        image: mariadb:10.6
+        image: mariadb:10.11
         ports:
           - 3306:3306
         env:

cws-adaptation-engine/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation-engine</artifactId>
 

cws-adaptation/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-adaptation</artifactId>
 

cws-core/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-core</artifactId>
 

cws-core/src/main/java/jpl/cws/core/db/SchedulerDbService.java

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.nasa.jpl.ammos.ids.cws</groupId>
 		<artifactId>common-workflow-service</artifactId>
-		<version>2.6.0</version><!-- update this each CWS release -->
+		<version>2.7.0</version><!-- update this each CWS release -->
 	</parent>
 	<artifactId>cws-engine-service</artifactId>
 

cws-engine-service/pom.xml

@@ -190,7 +190,7 @@ public void initProcessCountersAndLimits() {
 
 		log.debug("AFTER INIT: limits: " + workerMaxProcInstances + ",  counts: " + processCounters);
 	}
-	
+
 
 	public void updateStats() {
 
@@ -690,8 +690,17 @@ public List<Map<String,Object>> claimWithCounter(String limitToProcDefKey) {
 					continue;
 				}
 
-				currentCounts.put(procDefKey, processCounters.get(procDefKey));
-				remainders.put(procDefKey, procMaxNumber - currentCounts.get(procDefKey));
+				// Get current count from both local counter and global database count
+				int localCount = processCounters.get(procDefKey);
+				
+				// Query database for global count of running instances across all workers
+				int globalCount = schedulerDbService.countRunningProcInstances(procDefKey);
+				
+				// Use the higher of the two counts to ensure limits are respected
+				int effectiveCount = Math.max(localCount, globalCount);
+				
+				currentCounts.put(procDefKey, effectiveCount);
+				remainders.put(procDefKey, procMaxNumber - effectiveCount);
 				queryLimitForProcSet.put(procDefKey, Math.min(EXEC_SERVICE_MAX_POOL_SIZE, remainders.get(procDefKey)));
 
 				//log.trace("getting currentCount for procDefKey " + procDefKey);
@@ -1073,4 +1082,8 @@ public void bringWorkerDown() {
 	public String getWorkerId() {
 		return workerId;
 	}
-}
+	
+	public SchedulerDbService getSchedulerDbService() {
+		return schedulerDbService;
+	}
+}

cws-engine-service/src/main/java/jpl/cws/engine/WorkerService.java

@@ -67,10 +67,22 @@ public void run() {
 						}
 
 						if (eventType.equals("processEndEventDetected")) {
+							// First make sure the database status is updated to COMPLETE
+							workerService.getSchedulerDbService().markProcessInstanceComplete(uuid);
+							
+							// Then update local worker state if this worker started it
 							boolean endedOnThisWorker = 
 								workerService.processEndedActions(procDefKey, uuid);
+								
+							// Always trigger new process start attempts regardless of which worker handled it
+							// This ensures a fresh claim attempt happens when any process completes
+							workerService.procStartReqAction(null, "processEndEventDetected message received");
+							
+							// Log if this was our process or handled by another worker
 							if (endedOnThisWorker) {
-								workerService.procStartReqAction(null, "processEndEventDetected message received");
+								log.debug("Process " + uuid + " ended on this worker, local counters updated");
+							} else {
+								log.debug("Process " + uuid + " ended on another worker, attempting to start pending processes");
 							}
 						}
 						else if (eventType.equals("sync")) {