The Unified and Autonomous Development Platform
chore: Use unique build workspace and network for resubmitted build
Robin Shenf6b438e2df58
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex c880311d2c..e7909669ee 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -7306,4 +7306,15 @@ public class DataMigrator {}}+ private void migrate186(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Builds.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ element.addElement("submitSequence").setText("1");+ }+ dom.writeToFile(file, false);+ }+ }+ }}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.javaindex 600f711f18..3694f07eaf 100644--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java@@ -179,7 +179,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate volatile IMap<String, String> jobServers;private volatile IMap<String, Date> sequentialKeys;-+private volatile Map<String, List<JobSchedule>> branchSchedules;private volatile String maintenanceTaskId;@@ -535,6 +535,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizString projectGitDir = projectManager.getGitDir(build.getProject().getId()).getAbsolutePath();Long buildId = build.getId();Long buildNumber = build.getNumber();+ Long buildSequence = build.getSubmitSequence();String refName = build.getRefName();ObjectId commitId = ObjectId.fromString(build.getCommitHash());BuildSpec buildSpec = build.getSpec();@@ -565,11 +566,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizJobAuthorizationContext.pop();}- JobContext jobContext = new JobContext(jobToken, jobExecutor, sequentialGroup,- projectId, projectPath, projectGitDir, buildId, buildNumber, actions,- refName, commitId, services, timeout);+ JobContext jobContext = new JobContext(jobToken, jobExecutor, projectId, projectPath,+ projectGitDir, buildId, buildNumber, buildSequence, actions, refName, commitId,+ services, timeout);return executorService.submit(() -> {+ int retried = 0;while (true) {long beginTime = System.currentTimeMillis();if (sequentialKey != null) {@@ -607,11 +609,13 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthrowable = t;}- if (!checkRetry(job, jobContext, jobLogger, throwable)) {+ if (!checkRetry(job, jobContext, jobLogger, throwable, retried)) {if (throwable != null)throw ExceptionUtils.unchecked(throwable);elsereturn false;+ } else {+ retried++;}} finally {Collection<Thread> threads = serverStepThreads.remove(jobToken);@@ -629,8 +633,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz});}- private boolean checkRetry(Job job, JobContext jobContext, TaskLogger jobLogger, @Nullable Throwable throwable) {- int retried = jobContext.getRetried();+ private boolean checkRetry(Job job, JobContext jobContext, TaskLogger jobLogger,+ @Nullable Throwable throwable, int retried) {if (retried < job.getMaxRetries() && sessionManager.call(() -> {RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());AtomicReference<String> errorMessage = new AtomicReference<>(null);@@ -664,7 +668,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizlistenerRegistry.post(new BuildRetrying(innerBuild));buildManager.update(innerBuild);});- jobContext.setRetried(retried+1);return true;} else {return false;@@ -799,6 +802,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}build.setStatus(Build.Status.WAITING);+ build.setSubmitSequence(build.getSubmitSequence()+1);build.setJobToken(UUID.randomUUID().toString());build.setFinishDate(null);build.setPendingDate(null);diff --git a/server-core/src/main/java/io/onedev/server/job/JobContext.java b/server-core/src/main/java/io/onedev/server/job/JobContext.javaindex 3e921680bd..df0e750ffc 100644--- a/server-core/src/main/java/io/onedev/server/job/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/job/JobContext.java@@ -9,7 +9,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import org.eclipse.jgit.lib.ObjectId;-import javax.annotation.Nullable;import java.io.Serializable;import java.util.List;@@ -20,9 +19,7 @@ public class JobContext implements Serializable {private final String jobToken;private final JobExecutor jobExecutor;-- private final String sequentialGroup;-+private final Long projectId;private final String projectPath;@@ -32,6 +29,8 @@ public class JobContext implements Serializable {private final Long buildId;private final Long buildNumber;++ private final Long submitSequence;private final List<Action> actions;@@ -42,21 +41,19 @@ public class JobContext implements Serializable {private final List<ServiceFacade> services;private final long timeout;-- private volatile int retried;-- public JobContext(String jobToken, JobExecutor jobExecutor, @Nullable String sequentialGroup,- Long projectId, String projectPath, String projectGitDir, Long buildId,- Long buildNumber, List<Action> actions, String refName, ObjectId commitId,- List<ServiceFacade> services, long timeout) {++ public JobContext(String jobToken, JobExecutor jobExecutor, Long projectId, String projectPath,+ String projectGitDir, Long buildId, Long buildNumber, Long submitSequence,+ List<Action> actions, String refName, ObjectId commitId, List<ServiceFacade> services,+ long timeout) {this.jobToken = jobToken;this.jobExecutor = jobExecutor;- this.sequentialGroup = sequentialGroup;this.projectId = projectId;this.projectPath = projectPath;this.projectGitDir = projectGitDir;this.buildId = buildId;this.buildNumber = buildNumber;+ this.submitSequence = submitSequence;this.actions = actions;this.refName = refName;this.commitId = commitId;@@ -72,11 +69,6 @@ public class JobContext implements Serializable {return jobExecutor;}- @Nullable- public String getSequentialGroup() {- return sequentialGroup;- }-public Long getBuildId() {return buildId;}@@ -113,16 +105,12 @@ public class JobContext implements Serializable {return buildNumber;}- public long getTimeout() {- return timeout;+ public Long getSubmitSequence() {+ return submitSequence;}- public int getRetried() {- return retried;- }-- public void setRetried(int retried) {- this.retried = retried;+ public long getTimeout() {+ return timeout;}public LeafFacade getStep(List<Integer> stepPosition) {diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 01771e9638..306a386e32 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -348,6 +348,8 @@ public class Build extends ProjectBelongingprivate String uuid = UUID.randomUUID().toString();private long number;++ private long submitSequence = 1L;@Column(nullable=false)private String commitHash;@@ -537,6 +539,14 @@ public class Build extends ProjectBelongingthis.number = number;}+ public long getSubmitSequence() {+ return submitSequence;+ }++ public void setSubmitSequence(long submitSequence) {+ this.submitSequence = submitSequence;+ }+public String getUUID() {return uuid;}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 3baf8d722a..33c036fced 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@@ -354,7 +354,7 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwarprivate String getNamespace(@Nullable JobContext jobContext) {if (jobContext != null) {return getName() + "-" + jobContext.getProjectId() + "-"- + jobContext.getBuildNumber() + "-" + jobContext.getRetried();+ + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence();} else {return getName() + "-executor-test";}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 d0c83c0a9f..ddc023abcc 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@@ -105,7 +105,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {DockerJobData jobData = new DockerJobData(jobToken, getName(), jobContext.getProjectPath(),jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),- jobContext.getBuildNumber(), jobContext.getActions(), jobContext.getRetried(),+ jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions(),jobContext.getServices(), registryLogins, isMountDockerSock(), getDockerSockPath(),getDockerBuilder(), getCpuLimit(), getMemoryLimit(), getRunOptions(),getNetworkOptions(), isAlwaysPullImage());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 5f67e92490..d0a9739db3 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@@ -98,7 +98,7 @@ public class RemoteShellExecutor extends ServerShellExecutor {String jobToken = jobContext.getJobToken();ShellJobData jobData = new ShellJobData(jobToken, getName(), jobContext.getProjectPath(),jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),- jobContext.getBuildNumber(), jobContext.getActions());+ jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions());try {return call(agentSession, jobData, jobContext.getTimeout()*1000L);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 15bb30eaa9..239fbab548 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@@ -266,11 +266,11 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwcheckApplicable();hostBuildHome = new File(Bootstrap.getTempDir(),- "onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber());+ "onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence());FileUtils.createDir(hostBuildHome);try {String network = getName() + "-" + jobContext.getProjectId() + "-"- + jobContext.getBuildNumber() + "-" + jobContext.getRetried();+ + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence();String localServer = getClusterManager().getLocalServerAddress();jobLogger.log(String.format("Executing job (executor: %s, server: %s, network: %s)...",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 1f8a2145d4..d6d5e175dc 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@@ -98,7 +98,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatcheckApplicable();buildHome = new File(Bootstrap.getTempDir(),- "onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber());+ "onedev-build-" + jobContext.getProjectId() + "-" + jobContext.getBuildNumber() + "-" + jobContext.getSubmitSequence());FileUtils.createDir(buildHome);File workspaceDir = new File(buildHome, "workspace");try {@@ -125,7 +125,6 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatgetJobManager().reportJobWorkspace(jobContext, workspaceDir.getAbsolutePath());CompositeFacade entryFacade = new CompositeFacade(jobContext.getActions());- OsInfo osInfo = OneDev.getInstance(OsInfo.class);var successful = entryFacade.execute(new LeafHandler() {@Override