Merge "Stop running process"

bdeployteam · Nov 21, 2022 · 1972ced · 1972ced
2 parents d85c9c8 + e10e0f1
commit 1972ced
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/minion/src/main/java/io/bdeploy/minion/remote/jersey/MasterNamedResourceImpl.java b/minion/src/main/java/io/bdeploy/minion/remote/jersey/MasterNamedResourceImpl.java
@@ -73,6 +73,7 @@
 import io.bdeploy.interfaces.configuration.pcu.InstanceStatusDto;
 import io.bdeploy.interfaces.configuration.pcu.ProcessControlGroupConfiguration;
 import io.bdeploy.interfaces.configuration.pcu.ProcessDetailDto;
+import io.bdeploy.interfaces.configuration.pcu.ProcessState;
 import io.bdeploy.interfaces.configuration.pcu.ProcessStatusDto;
 import io.bdeploy.interfaces.configuration.system.SystemConfiguration;
 import io.bdeploy.interfaces.descriptor.application.ProcessControlDescriptor.ApplicationStartType;
@@ -926,8 +927,9 @@ public void stop(String instanceId, List<String> applicationIds) {
         for (var applicationId : applicationIds) {
             // Find node where the application is running
             Optional<String> node = status.node2Applications.entrySet().stream()
-                    .filter(e -> e.getValue().hasApps() && e.getValue().getStatus(applicationId) != null).map(Entry::getKey)
-                    .findFirst();
+                    .filter(e -> e.getValue().hasApps() && e.getValue().getStatus(applicationId) != null
+                            && e.getValue().getStatus(applicationId).processState != ProcessState.STOPPED)
+                    .map(Entry::getKey).findFirst();
 
             if (node.isEmpty()) {
                 continue; // ignore - not deployed.