Skip to content

The Unified and Autonomous Development Platform

Add will retry field to build table

Robin Shen5f2a4590c597
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
index e4131f619f..774e85ee7b 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java
@@ -58,6 +58,7 @@ import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.ci.job.paramspec.SecretParam;
import io.onedev.server.ci.job.retry.JobRetry;
+import io.onedev.server.ci.job.retry.RetryCondition;
import io.onedev.server.ci.job.trigger.JobTrigger;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
@@ -731,7 +732,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
public void on(BuildFinished event) {
Build build = event.getBuild();
JobRetry retry = build.getJob().getRetry();
- if (build.willRetry()) {
+ build.setWillRetry(build.getStatus() == Build.Status.FAILED
+ && retry != null
+ && build.getRetried() < retry.getMaxRetries()
+ && RetryCondition.parse(retry.getRetryCondition()).satisfied(build));
+
+ if (build.isWillRetry()) {
Long buildId = build.getId();
int retried = build.getRetried();
transactionManager.runAsyncAfterCommit(new Runnable() {
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.java
index 740c196d82..b4aa9da635 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
@@ -57,8 +57,6 @@ import io.onedev.server.ci.job.VariableInterpolator;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.ci.job.paramspec.ParamSpec;
import io.onedev.server.ci.job.paramspec.SecretParam;
-import io.onedev.server.ci.job.retry.JobRetry;
-import io.onedev.server.ci.job.retry.RetryCondition;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.support.inputspec.SecretInput;
@@ -152,6 +150,8 @@ public class Build extends AbstractEntity implements Referenceable {
private Date finishDate;
private int retried;
+
+ private boolean willRetry;
@Column(length=MAX_STATUS_MESSAGE_LEN)
private String statusMessage;
@@ -179,8 +179,6 @@ public class Build extends AbstractEntity implements Referenceable {
private transient Job job;
- private transient Boolean willRetry;
-
public Project getProject() {
return project;
}
@@ -321,6 +319,14 @@ public class Build extends AbstractEntity implements Referenceable {
this.retried = retried;
}
+ public boolean isWillRetry() {
+ return willRetry;
+ }
+
+ public void setWillRetry(boolean willRetry) {
+ this.willRetry = willRetry;
+ }
+
public Collection<BuildParam> getParams() {
return params;
}
@@ -663,15 +669,5 @@ public class Build extends AbstractEntity implements Referenceable {
public static String getWebSocketObservable(Long buildId) {
return Build.class.getName() + ":" + buildId;
}
-
- public boolean willRetry() {
- if (willRetry == null) {
- JobRetry retry = getJob().getRetry();
- willRetry = getStatus() == Build.Status.FAILED
- && retry != null
- && getRetried() < retry.getMaxRetries()
- && RetryCondition.parse(retry.getRetryCondition()).satisfied(this);
- }
- return willRetry;
- }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index 9f31c875c7..db3e39b909 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -7,7 +7,7 @@ query
;
criteria
- : operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria
+ : operator=(Successful|Failed|InError|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe|WillRetry) #OperatorCriteria
| operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|AssociatedWithPullRequest|RequiredByPullRequest) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -55,7 +55,11 @@ Waiting
Pending
: 'pending'
;
-
+
+WillRetry
+ : 'will' WS+ 'retry'
+ ;
+
SubmittedByMe
: 'submitted' WS+ 'by' WS+ 'me'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index ad0583c74a..ba4e9c09c0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -121,6 +121,8 @@ public class BuildQuery extends EntityQuery<Build> {
return new SubmittedByMeCriteria();
case BuildQueryLexer.CancelledByMe:
return new CancelledByMeCriteria();
+ case BuildQueryLexer.WillRetry:
+ return new WillRetryCriteria();
default:
throw new OneException("Unexpected operator: " + ctx.operator.getText());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java
new file mode 100644
index 0000000000..674b31fb34
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WillRetryCriteria.java
@@ -0,0 +1,39 @@
+package io.onedev.server.search.entity.build;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.util.BuildConstants;
+
+public class WillRetryCriteria extends EntityCriteria<Build> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Project project, Root<Build> root, CriteriaBuilder builder, User user) {
+ Path<?> attribute = root.get(BuildConstants.ATTR_WILL_RETRY);
+ return builder.equal(attribute, true);
+ }
+
+ @Override
+ public boolean matches(Build build, User user) {
+ return build.isWillRetry();
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return BuildQuery.getRuleName(BuildQueryLexer.WillRetry);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/BuildConstants.java b/server-core/src/main/java/io/onedev/server/util/BuildConstants.java
index e03dc8a731..f107357e6a 100644
--- a/server-core/src/main/java/io/onedev/server/util/BuildConstants.java
+++ b/server-core/src/main/java/io/onedev/server/util/BuildConstants.java
@@ -72,6 +72,8 @@ public class BuildConstants {
public static final String ATTR_PULL_REQUEST_BUILDS = "pullRequestBuilds";
+ public static final String ATTR_WILL_RETRY = "willRetry";
+
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
FIELD_NUMBER, FIELD_JOB, FIELD_STATUS, FIELD_SUBMITTER, FIELD_CANCELLER,
FIELD_SUBMIT_DATE, FIELD_QUEUEING_DATE, FIELD_RUNNING_DATE, FIELD_FINISH_DATE,