Skip to content

The Unified and Autonomous Development Platform

refactor(build): clarify rebuild settings and enhance resubmit logic

Robin Shen993bc0182e79
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.java
index f4ae5acf13..ff31fd272d 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
@@ -312,7 +312,7 @@ public class Job implements NamedElement, Validatable {
this.retryDelay = retryDelay;
}
- @Editable(order=9430, group="More Settings", description="Whether or not to also rebuild upstream jobs when rebuilding this job")
+ @Editable(order=9430, group="More Settings", description="Whether or not to also rebuild direct upstream jobs when rebuilding this job")
public boolean isIncludeUpstreamWhenRebuild() {
return includeUpstreamWhenRebuild;
}
@@ -321,7 +321,7 @@ public class Job implements NamedElement, Validatable {
this.includeUpstreamWhenRebuild = includeUpstreamWhenRebuild;
}
- @Editable(order=9440, group="More Settings", description="Whether or not to also rebuild downstream jobs when rebuilding this job")
+ @Editable(order=9440, group="More Settings", description="Whether or not to also rebuild direct downstream jobs when rebuilding this job")
public boolean isIncludeDownstreamWhenRebuild() {
return includeDownstreamWhenRebuild;
}
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index fd716e5e5c..52c98ea94e 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -821,14 +821,30 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
@Transactional
@Override
public void resubmit(User user, Build build, String reason) {
- if (doResubmit(user, build, reason)) {
- var job = build.getJob();
- if (job.isIncludeUpstreamWhenRebuild())
- resubmitUpstreamBuilds(build);
- else
- resubmitRequiredDependencyBuilds(build);
- if (job.isIncludeDownstreamWhenRebuild())
- resubmitDownstreamBuilds(build);
+ resubmit(user, build, reason, new HashSet<>());
+ }
+
+ private void resubmit(User user, Build build, String reason, Collection<Long> resubmitBuildIds) {
+ if (!resubmitBuildIds.add(build.getId()))
+ return;
+ if (!doResubmit(user, build, reason))
+ return;
+
+ var job = build.getJob();
+ var systemUser = userService.getSystem();
+ if (job.isIncludeUpstreamWhenRebuild()) {
+ for (var dependence : build.getDependencies()) {
+ resubmit(systemUser, dependence.getDependency(),
+ "Resubmitted by dependent build", resubmitBuildIds);
+ }
+ } else {
+ resubmitRequiredDependencyBuilds(build, resubmitBuildIds);
+ }
+ if (job.isIncludeDownstreamWhenRebuild()) {
+ for (var dependence : build.getDependents()) {
+ resubmit(systemUser, dependence.getDependent(),
+ "Resubmitted by dependency build", resubmitBuildIds);
+ }
}
}
@@ -879,33 +895,12 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
return false;
}
- private void resubmitRequiredDependencyBuilds(Build build) {
- var systemUser = userService.getSystem();
- for (var dependence : build.getDependencies()) {
- var dependency = dependence.getDependency();
- if (dependence.isRequireSuccessful() && !dependency.isSuccessful()
- && doResubmit(systemUser, dependency, "Resubmitted by dependent build")) {
- resubmitRequiredDependencyBuilds(dependency);
- }
- }
- }
-
- private void resubmitUpstreamBuilds(Build build) {
+ private void resubmitRequiredDependencyBuilds(Build build, Collection<Long> resubmitBuildIds) {
var systemUser = userService.getSystem();
for (var dependence : build.getDependencies()) {
var dependency = dependence.getDependency();
- if (doResubmit(systemUser, dependency, "Resubmitted by dependent build"))
- resubmitUpstreamBuilds(dependency);
- }
- }
-
- private void resubmitDownstreamBuilds(Build build) {
- var systemUser = userService.getSystem();
- for (var dependence : build.getDependents()) {
- var dependent = dependence.getDependent();
- if (doResubmit(systemUser, dependent, "Resubmitted by dependency build")) {
- resubmitRequiredDependencyBuilds(dependent);
- resubmitDownstreamBuilds(dependent);
+ if (dependence.isRequireSuccessful() && !dependency.isSuccessful()) {
+ resubmit(systemUser, dependency, "Resubmitted by dependent build", resubmitBuildIds);
}
}
}