The Unified and Autonomous Development Platform
HA support for job executor test
Robin Shenc66cbd882c9a
diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.htmlindex 27b9bf78fc..54bc984d9a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html@@ -10,7 +10,7 @@<div wicket:id="editor"></div></div><div class="modal-footer">- <button wicket:id="ok" class="dirty-aware btn btn-primary">Ok</button>+ <button wicket:id="ok" class="btn btn-primary">Ok</button><button wicket:id="cancel" class="btn btn-secondary">Cancel</button></div></form>diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.javaindex cf2c3303cd..ebec4d45cf 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java@@ -9,6 +9,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;@@ -63,6 +64,13 @@ abstract class BeanEditContentPanel extends Panel {form.add(new AjaxButton("ok") {+ @Override+ protected void onInitialize() {+ super.onInitialize();+ if (isDirtyAware())+ add(AttributeAppender.append("class", "dirty-aware"));+ }+@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);@@ -113,4 +121,9 @@ abstract class BeanEditContentPanel extends Panel {protected abstract void onSave(AjaxRequestTarget target);protected abstract void onCancel(AjaxRequestTarget target);++ protected boolean isDirtyAware() {+ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.javaindex 135252aeb0..623dc12243 100644--- a/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java@@ -40,6 +40,11 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPaprotected Component newContent(String id) {return new BeanEditContentPanel(id) {+ @Override+ protected boolean isDirtyAware() {+ return BeanEditModalPanel.this.isDirtyAware();+ }+@Overrideprotected void onSave(AjaxRequestTarget target) {BeanEditModalPanel.this.onSave(target, bean);@@ -73,6 +78,10 @@ public abstract class BeanEditModalPanel<T extends Serializable> extends ModalPa};}++ protected boolean isDirtyAware() {+ return true;+ }protected abstract void onSave(AjaxRequestTarget target, T bean);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.javaindex 48bb97e8d1..69d1a1aa36 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java@@ -175,6 +175,11 @@ abstract class JobExecutorEditPanel extends Panel {String title = EditableUtils.getDisplayName(testData.getClass());new BeanEditModalPanel<Serializable>(target, testData, Sets.newHashSet(), true, title) {+ @Override+ protected boolean isDirtyAware() {+ return false;+ }+@Overrideprotected void onSave(AjaxRequestTarget target, Serializable bean) {close();diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.javaindex 5cbf9cbd05..3d5cd344ca 100644--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java@@ -93,29 +93,42 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {}}+ private LogManager getLogManager() {+ return OneDev.getInstance(LogManager.class);+ }++ private ClusterManager getClusterManager() {+ return OneDev.getInstance(ClusterManager.class);+ }++ private ResourceAllocator getResourceAllocator() {+ return OneDev.getInstance(ResourceAllocator.class);+ }+@Overridepublic void test(TestData testData, TaskLogger jobLogger) {String jobToken = UUID.randomUUID().toString();- UUID localServerUUID = OneDev.getInstance(ClusterManager.class).getLocalServerUUID();- LogManager logManager = OneDev.getInstance(LogManager.class);- logManager.addJobLogger(jobToken, jobLogger);+ getLogManager().addJobLogger(jobToken, jobLogger);try {- OneDev.getInstance(ResourceAllocator.class).run(+ UUID localServerUUID = getClusterManager().getLocalServerUUID();+ jobLogger.log("Waiting for resources...");+ getResourceAllocator().run(new TestRunnable(jobToken, this, testData, localServerUUID),getAgentRequirement(), new HashMap<>());} finally {- logManager.removeJobLogger(jobToken);+ getLogManager().removeJobLogger(jobToken);}}private void testLocal(String jobToken, AgentInfo agentInfo,- TestData testData, UUID dispatcherMemberUUID) {+ TestData testData, UUID dispatcherServerUUID) {TaskLogger jobLogger = new TaskLogger() {@Overridepublic void log(String message, String sessionId) {- OneDev.getInstance(ClusterManager.class).runOnServer(- dispatcherMemberUUID, new LogTask(jobToken, message, sessionId));+ getClusterManager().runOnServer(+ dispatcherServerUUID,+ new LogTask(jobToken, message, sessionId));}};@@ -135,12 +148,23 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {TestDockerJobData jobData = new TestDockerJobData(getName(), jobToken,testData.getDockerImage(), registryLogins, getRunOptions());-- try {- WebsocketUtils.call(agentSession, jobData, 0);- } catch (InterruptedException | TimeoutException e) {- new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);- }++ if (getLogManager().getJobLogger(jobToken) == null) {+ getLogManager().addJobLogger(jobToken, jobLogger);+ try {+ WebsocketUtils.call(agentSession, jobData, 0);+ } catch (InterruptedException | TimeoutException e) {+ new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);+ } finally {+ getLogManager().removeJobLogger(jobToken);+ }+ } else {+ try {+ WebsocketUtils.call(agentSession, jobData, 0);+ } catch (InterruptedException | TimeoutException e) {+ new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);+ }+ }}@Overridediff --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 93c79ed4e2..333bfab07d 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@@ -93,19 +93,31 @@ public class RemoteShellExecutor extends ServerShellExecutor {new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);}}++ private LogManager getLogManager() {+ return OneDev.getInstance(LogManager.class);+ }++ private ClusterManager getClusterManager() {+ return OneDev.getInstance(ClusterManager.class);+ }++ private ResourceAllocator getResourceAllocator() {+ return OneDev.getInstance(ResourceAllocator.class);+ }@Overridepublic void test(TestData testData, TaskLogger jobLogger) {String jobToken = UUID.randomUUID().toString();- UUID localServerUUID = OneDev.getInstance(ClusterManager.class).getLocalServerUUID();- LogManager logManager = OneDev.getInstance(LogManager.class);- logManager.addJobLogger(jobToken, jobLogger);+ UUID localServerUUID = getClusterManager().getLocalServerUUID();+ getLogManager().addJobLogger(jobToken, jobLogger);try {- OneDev.getInstance(ResourceAllocator.class).run(+ jobLogger.log("Waiting for resources...");+ getResourceAllocator().run(new TestRunnable(jobToken, this, testData, localServerUUID),getAgentRequirement(), new HashMap<>());} finally {- logManager.removeJobLogger(jobToken);+ getLogManager().removeJobLogger(jobToken);}}@@ -115,8 +127,9 @@ public class RemoteShellExecutor extends ServerShellExecutor {@Overridepublic void log(String message, String sessionId) {- OneDev.getInstance(ClusterManager.class).runOnServer(- dispatcherMemberUUID, new LogTask(jobToken, message, sessionId));+ getClusterManager().runOnServer(+ dispatcherMemberUUID,+ new LogTask(jobToken, message, sessionId));}};@@ -126,12 +139,23 @@ public class RemoteShellExecutor extends ServerShellExecutor {jobLogger.log(String.format("Testing on agent '%s'...", agentData.getName()));TestShellJobData jobData = new TestShellJobData(jobToken, testData.getCommands());-- try {- WebsocketUtils.call(agentSession, jobData, 0);- } catch (InterruptedException | TimeoutException e) {- new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);- }++ if (getLogManager().getJobLogger(jobToken) == null) {+ getLogManager().addJobLogger(jobToken, jobLogger);+ try {+ WebsocketUtils.call(agentSession, jobData, 0);+ } catch (InterruptedException | TimeoutException e) {+ new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);+ } finally {+ getLogManager().removeJobLogger(jobToken);+ }+ } else {+ try {+ WebsocketUtils.call(agentSession, jobData, 0);+ } catch (InterruptedException | TimeoutException e) {+ new Message(MessageTypes.CANCEL_JOB, jobToken).sendBy(agentSession);+ }+ }}@Override