The Unified and Autonomous Development Platform
Remove the auto-discover job executor type
Robin Shen3d348632bb64
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 933dae4d14..41f80dbc01 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -83,10 +83,9 @@ import com.thoughtworks.xstream.core.JVM;import com.thoughtworks.xstream.mapper.MapperWrapper;import com.vladsch.flexmark.Extension;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AbstractPlugin;import io.onedev.commons.loader.AbstractPluginModule;-import io.onedev.commons.bootstrap.Bootstrap;-import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.StringUtils;@@ -201,8 +200,6 @@ import io.onedev.server.markdown.MarkdownProcessor;import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.authenticator.Authenticator;-import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;-import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.notification.BuildNotificationManager;import io.onedev.server.notification.CodeCommentNotificationManager;import io.onedev.server.notification.CommitNotificationManager;@@ -421,20 +418,6 @@ public class CoreModule extends AbstractPluginModule {bind(WebHookManager.class);- contribute(ImplementationProvider.class, new ImplementationProvider() {-- @Override- public Class<?> getAbstractClass() {- return JobExecutor.class;- }-- @Override- public Collection<Class<?>> getImplementations() {- return Sets.newHashSet(AutoDiscoveredJobExecutor.class);- }-- });-contribute(CodePullAuthorizationSource.class, DefaultJobManager.class);bind(IndexManager.class).to(DefaultIndexManager.class);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.javaindex 85f8e71b5b..6414bd25ee 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java@@ -38,7 +38,7 @@ public class CacheSpec implements Serializable {@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "+ "Specify \".\" (without quote) to cache workspace itself. "- + "<span class='text-warning'>Absolute path is not allowed if the job is executed by a shell/batch executor</span>")+ + "<span class='text-warning'>Absolute path is not allowed if the job is executed by a shell executor</span>")@Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestPaths")@NotEmptypublic String getPath() {diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex b3a331015e..1f7e8a1e91 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -28,7 +28,6 @@ import java.util.concurrent.locks.Lock;import java.util.function.Consumer;import java.util.function.Function;-import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;@@ -126,6 +125,7 @@ import io.onedev.server.util.schedule.TaskScheduler;import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.editable.EditableStringTransformer;+import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Interpolative;@Singleton@@ -394,13 +394,28 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}}- @Nullable- private JobExecutor getJobExecutor(Build build) {- for (JobExecutor executor: settingManager.getJobExecutors()) {- if (executor.isApplicable(build))- return executor;+ private JobExecutor getJobExecutor(Build build, TaskLogger jobLogger) {+ if (!settingManager.getJobExecutors().isEmpty()) {+ for (JobExecutor executor: settingManager.getJobExecutors()) {+ if (executor.isApplicable(build))+ return executor;+ }+ throw new ExplicitException("No applicable job executor");+ } else {+ jobLogger.log("No job executor defined, auto-discovering...");+ List<JobExecutorDiscoverer> discoverers = new ArrayList<>(OneDev.getExtensions(JobExecutorDiscoverer.class));+ discoverers.sort(Comparator.comparing(JobExecutorDiscoverer::getOrder));+ for (JobExecutorDiscoverer discoverer: discoverers) {+ JobExecutor jobExecutor = discoverer.discover(jobLogger);+ if (jobExecutor != null) {+ jobLogger.log("Discovered job executor type: "+ + EditableUtils.getDisplayName(jobExecutor.getClass()));+ jobExecutor.setName("auto-discovered");+ return jobExecutor;+ }+ }+ throw new ExplicitException("No job executor discovered");}- return null;}private JobExecution execute(Build build) {@@ -413,10 +428,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuildSpec buildSpec = build.getSpec();Job job = build.getJob();- JobExecutor executor = getJobExecutor(build);+ TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);+ JobExecutor executor = getJobExecutor(build, jobLogger);if (executor != null) {- TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);-ObjectId commitId = ObjectId.fromString(build.getCommitHash());Long buildId = build.getId();Long buildNumber = build.getNumber();diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex 0da0a75f35..479dfc0efd 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -184,7 +184,7 @@ public class Job implements NamedElement, Serializable, Validatable {}@Editable(order=9114, group="Dependencies & Services", description="Optionally specify services required by this job. "- + "<span class='text-warning'>This property will be ignored if the job is executed by a shell/batch executor</span>")+ + "<span class='text-warning'>This property will be ignored if the job is executed by a shell executor</span>")@ChoiceProvider("getServiceChoices")public List<String> getRequiredServices() {return requiredServices;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.javaindex 1c310cb688..a6a3fd69de 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java@@ -2,11 +2,14 @@ package io.onedev.server.buildspec.job;import javax.annotation.Nullable;+import io.onedev.commons.utils.TaskLogger;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;public interface JobExecutorDiscoverer {@Nullable- JobExecutor discover();+ JobExecutor discover(TaskLogger jobLogger);++ int getOrder();}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.javaindex 4fd7b862df..367139ac5e 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CommandStep.java@@ -29,7 +29,7 @@ public class CommandStep extends Step {private boolean useTTY;@Editable(order=100, description="Specify docker image to execute commands inside. "- + "<span class='text-warning'>This property will be ignored if the job is executed by a shell/batch executor</span>")+ + "<span class='text-warning'>This property will be ignored if the job is executed by a shell executor</span>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -57,7 +57,7 @@ public class CommandStep extends Step {+ "TTY mode to help identifying problems easily. However some commands running in this mode may "+ "wait for user input to cause build hanging. This can normally be fixed by adding extra options "+ "to the command. <span class='text-warning'>This option will be ignored when the job is executed "- + "via a shell/batch executor</span>")+ + "via a shell executor</span>")public boolean isUseTTY() {return useTTY;}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 58ff49da0d..0d68d08dd9 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -52,7 +52,6 @@ import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.ServiceDeskSetting;import io.onedev.server.model.support.administration.SshSetting;import io.onedev.server.model.support.administration.SystemSetting;-import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;import io.onedev.server.notification.MailManager;import io.onedev.server.persistence.PersistManager;@@ -200,11 +199,8 @@ public class DefaultDataManager implements DataManager, Serializable {settingManager.saveAuthenticator(null);}setting = settingManager.getSetting(Key.JOB_EXECUTORS);- if (setting == null) {- AutoDiscoveredJobExecutor executor = new AutoDiscoveredJobExecutor();- executor.setName("auto-discovered");- settingManager.saveJobExecutors(Lists.newArrayList(executor));- }+ if (setting == null)+ settingManager.saveJobExecutors(new ArrayList<>());setting = settingManager.getSetting(Key.SSO_CONNECTORS);if (setting == null) {settingManager.saveSsoConnectors(Lists.newArrayList());diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 21e8451542..535eb7653c 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -2948,5 +2948,26 @@ public class DataMigrator {}}}++ private void migrate63(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("JOB_EXECUTORS")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element executorElement: valueElement.elements()) {+ if (executorElement.getName().contains("AutoDiscoveredJobExecutor"))+ executorElement.detach();+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.javadeleted file mode 100644index e0504dde83..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java+++ /dev/null@@ -1,53 +0,0 @@-package io.onedev.server.model.support.administration.jobexecutor;--import java.util.ArrayList;-import java.util.Comparator;-import java.util.List;--import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.buildspec.job.JobContext;-import io.onedev.server.buildspec.job.JobExecutorDiscoverer;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Horizontal;--@Editable(order=10000, description="Discover appropriate job executor automatically")-@Horizontal-public class AutoDiscoveredJobExecutor extends JobExecutor {-- private static final long serialVersionUID = 1L;-- @Override- public void execute(String jobToken, JobContext context) {- context.getLogger().log("Discovering job executor...");- List<JobExecutor> jobExecutors = new ArrayList<>();- for (JobExecutorDiscoverer discoverer: OneDev.getExtensions(JobExecutorDiscoverer.class)) {- JobExecutor jobExecutor = discoverer.discover();- if (jobExecutor != null)- jobExecutors.add(jobExecutor);- }- if (!jobExecutors.isEmpty()) {- Collections.sort(jobExecutors, new Comparator<JobExecutor>() {-- @Override- public int compare(JobExecutor o1, JobExecutor o2) {- return EditableUtils.getOrder(o1.getClass()) - EditableUtils.getOrder(o2.getClass());- }-- });- JobExecutor jobExecutor = jobExecutors.iterator().next();- context.getLogger().log("Discovered job executor type: "- + EditableUtils.getDisplayName(jobExecutor.getClass()));- jobExecutor.setName(getName());- jobExecutor.setCacheTTL(getCacheTTL());- jobExecutor.setEnabled(isEnabled());- jobExecutor.setJobMatch(getJobMatch());- jobExecutor.execute(jobToken, context);- } else {- throw new ExplicitException("No job executors discovered");- }- }--}diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex fcf7bbdfba..aab2fd5a16 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -80,7 +80,7 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.util.Testable;-@Editable(order=600, description="This executor runs build jobs as pods in a kubernetes cluster. "+@Editable(order=KubernetesExecutor.ORDER, description="This executor runs build jobs as pods in a kubernetes cluster. "+ "No any agents are required."+ "<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system "+ "setting as job pods need to access it to download source and artifacts")@@ -88,6 +88,8 @@ import io.onedev.server.web.util.Testable;public class KubernetesExecutor extends JobExecutor implements Testable<TestData> {private static final long serialVersionUID = 1L;++ static final int ORDER = 100;private static final int POD_WATCH_TIMEOUT = 60;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 358cdc107c..183f741085 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@@ -9,6 +9,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;@@ -42,7 +43,8 @@ public class KubernetesModule extends AbstractPluginModule {contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {@Override- public JobExecutor discover() {+ public JobExecutor discover(TaskLogger jobLogger) {+ jobLogger.log("Checking if there is a Kubernetes cluster...");Commandline kubectl = new Commandline("kubectl");kubectl.addArgs("cluster-info");try {@@ -68,6 +70,11 @@ public class KubernetesModule extends AbstractPluginModule {return null;}}++ @Override+ public int getOrder() {+ return KubernetesExecutor.ORDER;+ }});diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.javaindex 56c643c07a..dcb950a0b0 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellExecutor.java@@ -28,7 +28,7 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-@Editable(order=500, name="Remote Shell/Batch Executor", description="This executor runs build jobs with remote machines's shell/batch facility via <a href='/administration/agents' target='_blank'>agents</a>")+@Editable(order=500, name="Remote Shell Executor", description="This executor runs build jobs with remote machines's shell facility via <a href='/administration/agents' target='_blank'>agents</a>")@Horizontalpublic class RemoteShellExecutor extends ServerShellExecutor {@@ -60,8 +60,8 @@ public class RemoteShellExecutor extends ServerShellExecutor {for (CacheSpec cacheSpec: jobContext.getCacheSpecs()) {if (new File(cacheSpec.getPath()).isAbsolute()) {- throw new ExplicitException("Shell/batch executor does not support "- + "absolute path of cache path: " + cacheSpec.getPath());+ throw new ExplicitException("Shell executor does not support "+ + "absolute cache path: " + cacheSpec.getPath());}}diff --git a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellModule.java b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellModule.javaindex 01d7c7f31f..462355def9 100644--- a/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellModule.java+++ b/server-plugin/server-plugin-executor-remoteshell/src/main/java/io/onedev/server/plugin/executor/remoteshell/RemoteShellModule.java@@ -6,8 +6,6 @@ import com.google.common.collect.Sets;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;-import io.onedev.server.buildspec.job.JobContext;-import io.onedev.server.buildspec.job.JobExecutorDiscoverer;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;/**@@ -35,26 +33,6 @@ public class RemoteShellModule extends AbstractPluginModule {});- contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {-- @Override- public JobExecutor discover() {- return new RemoteShellExecutor() {-- private static final long serialVersionUID = 1L;-- @Override- public void execute(String jobToken, JobContext jobContext) {- jobContext.getLogger().warning("No docker/kubernetes executor found, fall back "- + "to use shell executor...");- super.execute(jobToken, jobContext);- }-- };- }-- });-}}diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex 24d4482bcf..da5f07d258 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -79,13 +79,15 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.util.Testable;-@Editable(order=200, name="Server Docker Executor", description="This executor runs build jobs as docker containers on OneDev server")+@Editable(order=ServerDockerExecutor.ORDER, name="Server Docker Executor", description="This executor runs build jobs as docker containers on OneDev server")@ClassValidating@Horizontalpublic class ServerDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {private static final long serialVersionUID = 1L;+ static final int ORDER=200;+private static final Logger logger = LoggerFactory.getLogger(ServerDockerExecutor.class);private static final Object cacheHomeCreationLock = new Object();diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.javaindex d57e6f78e3..4af94208da 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.TaskLogger;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;@@ -40,7 +41,9 @@ public class ServerDockerModule extends AbstractPluginModule {contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {@Override- public JobExecutor discover() {+ public JobExecutor discover(TaskLogger jobLogger) {+ jobLogger.log("Checking if there is docker facility...");+Commandline docker = new Commandline("docker");docker.addArgs("version");try {@@ -66,6 +69,11 @@ public class ServerDockerModule extends AbstractPluginModule {return null;}}++ @Override+ public int getOrder() {+ return ServerDockerExecutor.ORDER;+ }});}diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex b75ae14118..62a424a9a0 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -56,12 +56,14 @@ import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.util.Testable;-@Editable(order=400, name="Server Shell/Batch Executor", description="This executor runs build jobs with OneDev server's shell/batch facility")+@Editable(order=ServerShellExecutor.ORDER, name="Server Shell Executor", description="This executor runs build jobs with OneDev server's shell facility")@Horizontalpublic class ServerShellExecutor extends JobExecutor implements Testable<TestData> {private static final long serialVersionUID = 1L;+ static final int ORDER = 400;+private static final Object cacheHomeCreationLock = new Object();private File getCacheHome() {@@ -89,8 +91,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatfor (CacheSpec cacheSpec: jobContext.getCacheSpecs()) {if (new File(cacheSpec.getPath()).isAbsolute()) {- throw new ExplicitException("Shell/batch executor does not support "- + "absolute path of cache path: " + cacheSpec.getPath());+ throw new ExplicitException("Shell executor does not support "+ + "absolute cache path: " + cacheSpec.getPath());}}jobLogger.log("Allocating job caches...") ;diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.javaindex 379cc74f95..2453d6b94b 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellModule.java@@ -6,7 +6,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.loader.AbstractPluginModule;import io.onedev.commons.loader.ImplementationProvider;-import io.onedev.server.buildspec.job.JobContext;+import io.onedev.commons.utils.TaskLogger;import io.onedev.server.buildspec.job.JobExecutorDiscoverer;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;@@ -38,19 +38,14 @@ public class ServerShellModule extends AbstractPluginModule {contribute(JobExecutorDiscoverer.class, new JobExecutorDiscoverer() {@Override- public JobExecutor discover() {- return new ServerShellExecutor() {-- private static final long serialVersionUID = 1L;-- @Override- public void execute(String jobToken, JobContext jobContext) {- jobContext.getLogger().warning("No docker/kubernetes executor found, fall back "- + "to use shell executor...");- super.execute(jobToken, jobContext);- }-- };+ public JobExecutor discover(TaskLogger jobLogger) {+ jobLogger.log("Fallback to shell facility");+ return new ServerShellExecutor();+ }++ @Override+ public int getOrder() {+ return ServerShellExecutor.ORDER;}});