Skip to content

The Unified and Autonomous Development Platform

feat: Add pending delete criteria for project query

Robin Shen38dd86df1cf6
diff --git a/pom.xml b/pom.xml
index 17911f7ace..b4f6b4db12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -636,8 +636,8 @@
</repository>
</repositories>
<properties>
- <commons.version>3.0.1</commons.version>
- <agent.version>2.0.5</agent.version>
+ <commons.version>3.0.2</commons.version>
+ <agent.version>2.0.6</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index d109c7aae7..1fdde69ed5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -34,7 +34,6 @@ import io.onedev.server.git.command.LfsFetchAllCommand;
import io.onedev.server.git.command.LfsFetchCommand;
import io.onedev.server.git.hook.HookUtils;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.job.JobManager;
import io.onedev.server.model.*;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.code.BranchProtection;
@@ -155,9 +154,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final PullRequestManager pullRequestManager;
private final LinkSpecManager linkSpecManager;
-
- private final JobManager jobManager;
-
+
private final ProjectLastEventDateManager lastEventDateManager;
private final ListenerRegistry listenerRegistry;
@@ -201,7 +198,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
SettingManager settingManager, TransactionManager transactionManager,
SessionManager sessionManager, ListenerRegistry listenerRegistry,
UserAuthorizationManager userAuthorizationManager, RoleManager roleManager,
- JobManager jobManager, IssueManager issueManager, LinkSpecManager linkSpecManager,
+ IssueManager issueManager, LinkSpecManager linkSpecManager,
ClusterManager clusterManager, GitService gitService, TaskScheduler taskScheduler,
ProjectLastEventDateManager lastEventDateManager, PullRequestManager pullRequestManager,
AttachmentManager attachmentManager, BatchWorkManager batchWorkManager,
@@ -218,7 +215,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
this.listenerRegistry = listenerRegistry;
this.userAuthorizationManager = userAuthorizationManager;
this.roleManager = roleManager;
- this.jobManager = jobManager;
this.issueManager = issueManager;
this.linkSpecManager = linkSpecManager;
this.clusterManager = clusterManager;
diff --git a/server-core/src/main/java/io/onedev/server/git/CommandUtils.java b/server-core/src/main/java/io/onedev/server/git/CommandUtils.java
index 4cd3fe220e..947d62b9d4 100644
--- a/server-core/src/main/java/io/onedev/server/git/CommandUtils.java
+++ b/server-core/src/main/java/io/onedev/server/git/CommandUtils.java
@@ -5,7 +5,6 @@ import io.onedev.commons.bootstrap.SensitiveMasker;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.ErrorCollector;
import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.k8shelper.KubernetesHelper;
@@ -24,11 +23,12 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
public class CommandUtils {
private static final Logger logger = LoggerFactory.getLogger(CommandUtils.class);
@@ -131,11 +131,10 @@ public class CommandUtils {
public static void uploadPack(File gitDir, Map<String, String> environments, String protocol,
InputStream stdin, OutputStream stdout) {
AtomicBoolean toleratedErrors = new AtomicBoolean(false);
- ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
+ var stderr = new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
- super.consume(line);
// This error may happen during a normal shallow fetch/clone
if (line.contains("remote end hung up unexpectedly")) {
toleratedErrors.set(true);
@@ -148,31 +147,27 @@ public class CommandUtils {
};
ExecutionResult result;
- UploadPackCommand upload = new UploadPackCommand(gitDir, stdin, stdout, stderr, environments);
+ var upload = new UploadPackCommand(gitDir, stdin, stdout, stderr, environments);
upload.statelessRpc(true).protocol(protocol);
result = upload.run();
- result.setErrorMessage(stderr.getMessage());
-
if (result.getReturnCode() != 0 && !toleratedErrors.get())
throw result.buildException();
}
public static void receivePack(File gitDir, Map<String, String> environments, String protocol,
InputStream stdin, OutputStream stdout) {
- ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
+ var stderr = new LineConsumer(UTF_8.name()) {
@Override
public void consume(String line) {
- super.consume(line);
logger.error(line);
}
};
- ReceivePackCommand receive = new ReceivePackCommand(gitDir, stdin, stdout, stderr, environments);
+ var receive = new ReceivePackCommand(gitDir, stdin, stdout, stderr, environments);
receive.statelessRpc(true).protocol(protocol);
ExecutionResult result = receive.run();
- result.setErrorMessage(stderr.getMessage());
result.checkReturnCode();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
new file mode 100644
index 0000000000..de51803836
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/PendingDeleteCriteria.java
@@ -0,0 +1,30 @@
+package io.onedev.server.search.entity.project;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.criteria.Criteria;
+
+import javax.persistence.criteria.*;
+
+public class PendingDeleteCriteria extends Criteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Path<String> attribute = from.get(Project.PROP_PENDING_DELETE);
+ return builder.equal(attribute, true);
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ return project.isPendingDelete();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.PendingDelete);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
index db762a13d4..992eb52856 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
@@ -7,7 +7,7 @@ query
;
criteria
- : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage) #OperatorCriteria
+ : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage|PendingDelete) #OperatorCriteria
| operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsNot|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -85,6 +85,10 @@ MissingStorage
: 'missing' WS+ 'storage'
;
+PendingDelete
+ : 'pending' WS+ 'delete'
+ ;
+
ChildrenOf
: 'children' WS+ 'of'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 68955e0cdf..5ae524e84d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -111,6 +111,8 @@ public class ProjectQuery extends EntityQuery<Project> {
return new HasOutdatedReplicasCriteria();
case MissingStorage:
return new MissingStorageCriteria();
+ case PendingDelete:
+ return new PendingDeleteCriteria();
default:
throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
index 345fdedd99..7b34a79e3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
@@ -5,6 +5,9 @@
<ul class="list-unstyled">
<li wicket:id="executors" class="executor mb-5"><div wicket:id="executor"></div></li>
</ul>
+ <div wicket:id="noExecutors" class="alert alert-info mb-5">
+ No executors defined. Jobs will use auto-discovered executor with default settings
+ </div>
<div wicket:id="newExecutor"></div>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
index 1228c9c59d..16376696e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
@@ -43,13 +43,13 @@ public class JobExecutorsPage extends AdministrationPage {
container = new WebMarkupContainer("jobExecutorSetting");
container.setOutputMarkupId(true);
add(container);
- container.add(new ListView<JobExecutor>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {
+ container.add(new ListView<>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {
@Override
public List<JobExecutor> getObject() {
return getSettingManager().getJobExecutors();
}
-
+
}) {
@Override
@@ -76,7 +76,7 @@ public class JobExecutorsPage extends AdministrationPage {
});
}
-
+
});
container.add(new SortBehavior() {
@@ -92,6 +92,13 @@ public class JobExecutorsPage extends AdministrationPage {
}.items("li.executor").handle(".card-header"));
container.add(newAddNewFrag());
+ container.add(new WebMarkupContainer("noExecutors") {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getSettingManager().getJobExecutors().isEmpty());
+ }
+ });
}
private Component newAddNewFrag() {