The Unified and Autonomous Development Platform
Add name to job executor in order to identify which executor is being used in a job
Robin Shen8322c0fb5e54
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 351d2708c7..c3dddb8b0d 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@@ -206,7 +206,9 @@ public class DefaultDataManager implements DataManager, Serializable {}setting = settingManager.getSetting(Key.JOB_EXECUTORS);if (setting == null) {- settingManager.saveJobExecutors(Lists.newArrayList(new AutoDiscoveredJobExecutor()));+ AutoDiscoveredJobExecutor executor = new AutoDiscoveredJobExecutor();+ executor.setName("auto discovered");+ settingManager.saveJobExecutors(Lists.newArrayList(executor));}setting = settingManager.getSetting(Key.JOB_SCRIPTS);if (setting == null) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.javaindex 761356b5fb..eb3e971320 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java@@ -5,6 +5,7 @@ import java.util.ArrayList;import java.util.List;import org.eclipse.jgit.lib.ObjectId;+import org.hibernate.validator.constraints.NotEmpty;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.codeassist.InputSuggestion;@@ -30,6 +31,8 @@ public abstract class JobExecutor implements Serializable {private boolean enabled = true;+ private String name;+private String applicableProjects;private String applicableBranches;@@ -48,6 +51,16 @@ public abstract class JobExecutor implements Serializable {this.enabled = enabled;}+ @Editable(order=10)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }+@Editable(order=10000, group="Job Applicability",description="Optionally specify space-separated projects applicable for this executor. "+ "Use * or ? for wildcard match. Leave empty to match all")diff --git a/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.javaindex 11a43e7f64..0cd7d29009 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/ValueEditor.java@@ -53,7 +53,7 @@ public abstract class ValueEditor<T> extends FormComponentPanel<T> {error(errorMessage);}- protected void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {+ public void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {error(Path.describe(propertyNode, pathInProperty) + ": " + errorMessage);}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.javaindex bff5300cc2..b4a73ef29c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.java@@ -16,11 +16,11 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.ValueEditor;-import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;@SuppressWarnings("serial")@@ -111,11 +111,10 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {private Component newBeanEditor(Serializable propertyValue) {Component beanEditor;- if (propertyValue != null) {+ if (propertyValue != null)beanEditor = BeanContext.edit(BEAN_EDITOR_ID, propertyValue, excludedProperties, true);- } else {+ elsebeanEditor = new WebMarkupContainer(BEAN_EDITOR_ID).setVisible(false);- }beanEditor.setOutputMarkupId(true);beanEditor.setOutputMarkupPlaceholderTag(true);return beanEditor;@@ -123,7 +122,11 @@ public class BeanPropertyEditor extends PropertyEditor<Serializable> {@Overridepublic void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {- ((ValueEditor<?>) get(BEAN_EDITOR_ID)).error(pathInProperty, errorMessage);+ Component editor = get(BEAN_EDITOR_ID);+ if (editor instanceof ValueEditor)+ ((ValueEditor<?>) editor).error(propertyNode, pathInProperty, errorMessage);+ else+ super.error(propertyNode, pathInProperty, errorMessage);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.cssindex 3f47b3407e..18a9fcb203 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css@@ -102,8 +102,8 @@}.property-viewer>.bean-list>tfoot>tr>td.no-elements>div {border-top: 2px solid #DDD;- margin-top: -6px;- padding-top: 6px;+ margin-top: -7px;+ padding-top: 7px;}.editable>.polymorphic>.type-selector {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.javaindex a62b68ce9b..b0524f2f97 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java@@ -30,11 +30,11 @@ import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.ValueEditor;-import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.annotation.ExcludedProperties;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -227,7 +227,11 @@ public class PolymorphicPropertyEditor extends PropertyEditor<Serializable> {@Overridepublic void error(PathNode propertyNode, Path pathInProperty, String errorMessage) {- ((ValueEditor<?>) get(BEAN_EDITOR_ID)).error(pathInProperty, errorMessage);+ Component editor = get(BEAN_EDITOR_ID);+ if (editor instanceof ValueEditor)+ ((ValueEditor<?>) editor).error(propertyNode, pathInProperty, errorMessage);+ else+ super.error(propertyNode, pathInProperty, errorMessage);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.javaindex 665b53bdac..3c20e5f8a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java@@ -5,6 +5,9 @@ import java.lang.reflect.ParameterizedType;import java.lang.reflect.Type;import java.util.List;+import javax.annotation.Nullable;++import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;@@ -22,6 +25,8 @@ import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;+import io.onedev.server.web.editable.Path;+import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.util.Testable;@SuppressWarnings("serial")@@ -38,13 +43,22 @@ abstract class JobExecutorEditPanel extends Panel {this.executorIndex = executorIndex;}+ @Nullable+ private JobExecutor getExecutor(String name) {+ for (JobExecutor executor: executors) {+ if (executor.getName().equals(name))+ return executor;+ }+ return null;+ }+@Overrideprotected void onInitialize() {super.onInitialize();JobExecutorBean bean = new JobExecutorBean();if (executorIndex != -1)- bean.setExecutor(executors.get(executorIndex));+ bean.setExecutor(SerializationUtils.clone(executors.get(executorIndex)));BeanEditor editor = BeanContext.edit("editor", bean);@@ -55,7 +69,17 @@ abstract class JobExecutorEditPanel extends Panel {super.onSubmit(target, form);JobExecutor executor = bean.getExecutor();-+ if (executorIndex != -1) {+ JobExecutor oldExecutor = executors.get(executorIndex);+ if (!executor.getName().equals(oldExecutor.getName()) && getExecutor(executor.getName()) != null) {+ editor.error(new Path(new PathNode.Named("executor"), new PathNode.Named("name")),+ "This name has already been used by another job executor");+ }+ } else if (getExecutor(executor.getName()) != null) {+ editor.error(new Path(new PathNode.Named("executor"), new PathNode.Named("name")),+ "This name has already been used by another job executor");+ }+if (editor.isValid()) {if (executorIndex != -1) {executors.set(executorIndex, executor);@@ -93,18 +117,18 @@ abstract class JobExecutorEditPanel extends Panel {protected void onConfigure() {super.onConfigure();- BeanEditor jobExecutorEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {+ BeanEditor executorEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {public void component(BeanEditor component, IVisit<BeanEditor> visit) {visit.stop(component);}});- if (jobExecutorEditor != null- && jobExecutorEditor.isVisibleInHierarchy()- && Testable.class.isAssignableFrom(jobExecutorEditor.getDescriptor().getBeanClass())) {+ if (executorEditor != null+ && executorEditor.isVisibleInHierarchy()+ && Testable.class.isAssignableFrom(executorEditor.getDescriptor().getBeanClass())) {Class<? extends Serializable> testDataClass = null;- for (Type type: jobExecutorEditor.getDescriptor().getBeanClass().getGenericInterfaces()) {+ for (Type type: executorEditor.getDescriptor().getBeanClass().getGenericInterfaces()) {ParameterizedType parameterizedType = (ParameterizedType) type;if (parameterizedType.getRawType() == Testable.class) {testDataClass = (Class<? extends Serializable>) parameterizedType.getActualTypeArguments()[0];diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.javaindex 7b6e69161c..7b69c10dc3 100644--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java@@ -469,7 +469,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V@Overridepublic Void call() {String network = createNetwork(jobContext, jobLogger);- jobLogger.log("Executing job (executor: docker, network: " + network + ", image: " + jobContext.getImage() + ")...");+ jobLogger.log(String.format("Executing job (executor: %s, network: %s, image: %s)...",+ getName(), network, jobContext.getImage()));try {jobContext.notifyJobRunning();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 ca5b4d6edc..889d019a55 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@@ -660,7 +660,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}).checkReturnCode();String namespace = createNamespace(jobContext, jobLogger);- jobLogger.log("Executing job (executor: kubernetes, namespace: " + namespace + ", image: " + dockerImage + ")...");+ jobLogger.log(String.format("Executing job (executor: %s, namespace: %s, image: %s)...",+ getName(), namespace, dockerImage));try {String imagePullSecretName = createImagePullSecret(namespace, jobLogger);