The Unified and Autonomous Development Platform
Fix the issue that canceling job executor discovering causes the job to run
Robin Shen34ebe5f56acf
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.javaindex f2e83e621a..e73b517fdc 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java@@ -6,6 +6,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;@@ -59,7 +60,10 @@ public class DockerModule extends AbstractPluginModule {return new DockerExecutor();} catch (Exception e) {- return null;+ if (ExceptionUtils.find(e, InterruptedException.class) != null)+ throw ExceptionUtils.unchecked(e);+ else+ return null;}}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.javaindex b870ed1cda..2af687fa55 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java@@ -8,6 +8,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.launcher.loader.ImplementationProvider;+import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;@@ -61,7 +62,10 @@ public class KubernetesModule extends AbstractPluginModule {return new KubernetesExecutor();} catch (Exception e) {- return null;+ if (ExceptionUtils.find(e, InterruptedException.class) != null)+ throw ExceptionUtils.unchecked(e);+ else+ return null;}}