Skip to content

The Unified and Autonomous Development Platform

midwork

Robin Shen69c40c738eee
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index c69e386c5f..679db0c903 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -115,6 +115,18 @@ public interface ProjectManager extends EntityManager<Project> {
Map<String, ProjectReplica> getReplicas(Long projectId);
+ Collection<Long> getIdsWithoutEnoughReplicas();
+
+ Collection<Long> getIdsHasOutdatedReplicas();
+
+ Collection<Long> getIdsMissingStorage();
+
+ boolean hasOutdatedReplicas(Long projectId);
+
+ boolean isWithoutEnoughReplicas(Long projectId);
+
+ boolean isMissingStorage(Long projectId);
+
void requestToSyncReplica(Long projectId, String syncWithServer);
Collection<ObjectId> readLfsSinceCommits(Long projectId);
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 3f20ef03b8..b11fb88b4c 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
@@ -1343,7 +1343,72 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public Map<String, ProjectReplica> getReplicas(Long projectId) {
return replicas.get(projectId);
}
+
+ @Override
+ public Collection<Long> getIdsWithoutEnoughReplicas() {
+ var ids = new HashSet<Long>();
+ for (var entry: replicas.entrySet()) {
+ if (isWithoutEnoughReplicas(entry.getValue()))
+ ids.add(entry.getKey());
+ }
+ return ids;
+ }
+
+ @Override
+ public Collection<Long> getIdsHasOutdatedReplicas() {
+ var ids = new HashSet<Long>();
+ var activeServers = new HashMap<>(this.activeServers);
+ for (var entry: replicas.entrySet()) {
+ var activeServer = activeServers.get(entry.getKey());
+ if (hasOutdatedReplicas(entry.getValue(), activeServer))
+ ids.add(entry.getKey());
+ }
+ return ids;
+ }
+
+ @Override
+ public boolean hasOutdatedReplicas(Long projectId) {
+ var replicasOfProject = replicas.get(projectId);
+ var activeServer = getActiveServer(projectId, false);
+ if (replicasOfProject != null && activeServer != null)
+ return hasOutdatedReplicas(replicasOfProject, activeServer);
+ else
+ return false;
+ }
+
+ private boolean hasOutdatedReplicas(Map<String, ProjectReplica> replicasOfProject, String activeServer) {
+ var activeReplica = replicasOfProject.get(activeServer);
+ return replicasOfProject.entrySet().stream().anyMatch(it -> clusterManager.getServer(it.getKey(), false) != null && it.getValue().getType() != REDUNDANT && it.getValue().getVersion() < activeReplica.getVersion());
+ }
+ @Override
+ public boolean isWithoutEnoughReplicas(Long projectId) {
+ var replicasOfProject = replicas.get(projectId);
+ if (replicasOfProject != null)
+ return isWithoutEnoughReplicas(replicasOfProject);
+ else
+ return false;
+ }
+
+ private boolean isWithoutEnoughReplicas(Map<String, ProjectReplica> replicasOfProject) {
+ var count = replicasOfProject.entrySet().stream()
+ .filter(it -> it.getValue().getType() != REDUNDANT && clusterManager.getServer(it.getKey(), false) != null)
+ .count();
+ return count < settingManager.getClusterSetting().getReplicaCount();
+ }
+
+ @Override
+ public Collection<Long> getIdsMissingStorage() {
+ var ids = getIds();
+ ids.removeAll(activeServers.keySet());
+ return ids;
+ }
+
+ @Override
+ public boolean isMissingStorage(Long projectId) {
+ return replicas.get(projectId) == null;
+ }
+
private void updateReplicaVersion(Long projectId) {
var projectDir = getStorageDir(projectId);
while (true) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
new file mode 100644
index 0000000000..0f87fd54cf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/HasOutdatedReplicasCriteria.java
@@ -0,0 +1,34 @@
+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.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+public class HasOutdatedReplicasCriteria extends Criteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ return forManyValues(builder, from.get(Project.PROP_ID),
+ projectManager.getIdsHasOutdatedReplicas(), projectManager.getIds());
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ return OneDev.getInstance(ProjectManager.class).hasOutdatedReplicas(project.getId());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.HasOutdatedReplicas);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
new file mode 100644
index 0000000000..96499eb4fa
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/MissingStorageCriteria.java
@@ -0,0 +1,34 @@
+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.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+public class MissingStorageCriteria extends Criteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ return forManyValues(builder, from.get(Project.PROP_ID),
+ projectManager.getIdsMissingStorage(), projectManager.getIds());
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ return OneDev.getInstance(ProjectManager.class).isMissingStorage(project.getId());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.MissingStorage);
+ }
+
+}
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 29fa8e1ce5..ada6cba20c 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) #OperatorCriteria
+ : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone|HasOutdatedReplicas|WithoutEnoughReplicas|MissingStorage) #OperatorCriteria
| operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -39,7 +39,7 @@ OwnedByMe
OwnedByNone
: 'owned' WS+ 'by' WS+ 'none'
;
-
+
IsSince
: 'is' WS+ 'since'
;
@@ -67,7 +67,19 @@ Leafs
ForkRoots
: 'fork' WS+ 'roots'
;
-
+
+WithoutEnoughReplicas
+ : 'without' WS+ 'enough' WS+ 'replicas'
+ ;
+
+HasOutdatedReplicas
+ : 'has' WS+ 'outdated' WS+ 'replicas'
+ ;
+
+MissingStorage
+ : 'missing' WS+ 'storage'
+ ;
+
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 d54e7d36ee..9f8fd8c9da 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
@@ -1,38 +1,37 @@
package io.onedev.server.search.entity.project;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.BaseErrorListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.project.ProjectQueryParser.AndCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.CriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.NotCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorValueCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.OrCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.OrderContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.ParensCriteriaContext;
-import io.onedev.server.search.entity.project.ProjectQueryParser.QueryContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.*;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
+import org.antlr.v4.runtime.*;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.ChildrenOf;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Contains;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.ForkRoots;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.ForksOf;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.HasOutdatedReplicas;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsSince;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsUntil;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Leafs;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.MissingStorage;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.OwnedByMe;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.OwnedByNone;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Roots;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.WithoutEnoughReplicas;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.ruleNames;
public class ProjectQuery extends EntityQuery<Project> {
@@ -90,23 +89,33 @@ public class ProjectQuery extends EntityQuery<Project> {
@Override
public Criteria<Project> visitOperatorCriteria(OperatorCriteriaContext ctx) {
- if (ctx.operator.getType() == ProjectQueryLexer.Roots)
- return new RootsCriteria();
- else if (ctx.operator.getType() == ProjectQueryLexer.Leafs)
- return new LeafsCriteria();
- else if (ctx.operator.getType() == ProjectQueryLexer.ForkRoots)
- return new ForkRootsCriteria();
- else if (ctx.operator.getType() == ProjectQueryLexer.OwnedByMe)
- return new OwnedByMeCriteria();
- else
- return new OwnedByNoneCriteria();
+ switch (ctx.operator.getType()) {
+ case Roots:
+ return new RootsCriteria();
+ case Leafs:
+ return new LeafsCriteria();
+ case ForkRoots:
+ return new ForkRootsCriteria();
+ case OwnedByMe:
+ return new OwnedByMeCriteria();
+ case OwnedByNone:
+ return new OwnedByNoneCriteria();
+ case WithoutEnoughReplicas:
+ return new WithoutEnoughReplicasCriteria();
+ case HasOutdatedReplicas:
+ return new HasOutdatedReplicasCriteria();
+ case MissingStorage:
+ return new MissingStorageCriteria();
+ default:
+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
+ }
}
public Criteria<Project> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
String value = getValue(ctx.Quoted().getText());
- if (ctx.operator.getType() == ProjectQueryLexer.ChildrenOf)
+ if (ctx.operator.getType() == ChildrenOf)
return new ChildrenOfCriteria(value);
- else if (ctx.operator.getType() == ProjectQueryLexer.ForksOf)
+ else if (ctx.operator.getType() == ForksOf)
return new ForksOfCriteria(value);
else
return new OwnedByCriteria(getUser(value));
@@ -125,7 +134,7 @@ public class ProjectQuery extends EntityQuery<Project> {
checkField(fieldName, operator);
switch (operator) {
- case ProjectQueryLexer.Is:
+ case Is:
if (fieldName.equals(Project.NAME_NAME))
return new NameCriteria(value);
else if (fieldName.equals(Project.NAME_SERVICE_DESK_NAME))
@@ -134,10 +143,10 @@ public class ProjectQuery extends EntityQuery<Project> {
return new PathCriteria(value);
else
return new LabelCriteria(getLabelSpec(value));
- case ProjectQueryLexer.Contains:
+ case Contains:
return new DescriptionCriteria(value);
- case ProjectQueryLexer.IsUntil:
- case ProjectQueryLexer.IsSince:
+ case IsUntil:
+ case IsSince:
if (fieldName.equals(Project.NAME_LAST_ACTIVITY_DATE))
return new LastActivityDateCriteria(value, operator);
else
@@ -202,11 +211,11 @@ public class ProjectQuery extends EntityQuery<Project> {
if (!Project.QUERY_FIELDS.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
- case ProjectQueryLexer.Contains:
+ case Contains:
if (!fieldName.equals(Project.NAME_DESCRIPTION))
throw newOperatorException(fieldName, operator);
break;
- case ProjectQueryLexer.Is:
+ case Is:
if (!fieldName.equals(Project.NAME_NAME)
&& !fieldName.equals(Project.NAME_LABEL)
&& !fieldName.equals(Project.NAME_SERVICE_DESK_NAME)
@@ -214,8 +223,8 @@ public class ProjectQuery extends EntityQuery<Project> {
throw newOperatorException(fieldName, operator);
}
break;
- case ProjectQueryLexer.IsUntil:
- case ProjectQueryLexer.IsSince:
+ case IsUntil:
+ case IsSince:
if (!fieldName.equals(Project.NAME_LAST_ACTIVITY_DATE)
&& !fieldName.equals(Project.NAME_LAST_COMMIT_DATE)) {
throw newOperatorException(fieldName, operator);
@@ -242,11 +251,11 @@ public class ProjectQuery extends EntityQuery<Project> {
}
public static String getRuleName(int rule) {
- return AntlrUtils.getLexerRuleName(ProjectQueryLexer.ruleNames, rule);
+ return AntlrUtils.getLexerRuleName(ruleNames, rule);
}
public static int getOperator(String operatorName) {
- return AntlrUtils.getLexerRule(ProjectQueryLexer.ruleNames, operatorName);
+ return AntlrUtils.getLexerRule(ruleNames, operatorName);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
new file mode 100644
index 0000000000..721e4893ae
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/WithoutEnoughReplicasCriteria.java
@@ -0,0 +1,34 @@
+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.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+
+public class WithoutEnoughReplicasCriteria extends Criteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
+ return forManyValues(builder, from.get(Project.PROP_ID),
+ projectManager.getIdsWithoutEnoughReplicas(), projectManager.getIds());
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ return OneDev.getInstance(ProjectManager.class).isWithoutEnoughReplicas(project.getId());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.WithoutEnoughReplicas);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index 6e3ae03672..0afde0905d 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -1,12 +1,14 @@
package io.onedev.server.web.behavior;
import static io.onedev.server.search.entity.project.ProjectQuery.getRuleName;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
+import io.onedev.server.cluster.ClusterManager;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Optional;
@@ -134,9 +136,13 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
@Override
protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ if (!OneDev.getInstance(ClusterManager.class).isClusteringSupported()
+ && (suggestedLiteral.equals(getRuleName(WithoutEnoughReplicas)) || suggestedLiteral.equals(getRuleName(HasOutdatedReplicas)))) {
+ return null;
+ }
if (childQuery) {
- if (suggestedLiteral.equals(getRuleName(ProjectQueryParser.ChildrenOf))
- || suggestedLiteral.equals(getRuleName(ProjectQueryParser.Roots))) {
+ if (suggestedLiteral.equals(getRuleName(ChildrenOf))
+ || suggestedLiteral.equals(getRuleName(Roots))) {
return null;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 570c761cc6..2f88d3002f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -203,7 +203,7 @@ public abstract class ProjectInfoPanel extends Panel {
for (var server: getClusterManager().getServerAddresses())
orders.put(server, index++);
return replicas.stream()
- .filter(it -> getClusterManager().getServer(it.getKey(), false) != null && (it.getValue().getType() != REDUNDANT || it.getKey().equals(activeServer)))
+ .filter(it -> orders.containsKey(it.getKey()) && (it.getValue().getType() != REDUNDANT || it.getKey().equals(activeServer)))
.sorted(comparingInt(o -> orders.get(o.getKey())))
.collect(Collectors.toList());
}