The Unified and Autonomous Development Platform
Refactoring clustering support
Robin Shen1f7b83c7bd06
diff --git a/pom.xml b/pom.xmlindex f42bb16548..d938cc51d4 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.2.0</version></parent><artifactId>server</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 2b1c232e4a..07f483716c 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex c5ed310e87..20c08bd29b 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -89,6 +89,8 @@ import io.onedev.server.search.entitytext.*;import io.onedev.server.security.*;import io.onedev.server.security.realm.AbstractAuthorizingRealm;import io.onedev.server.ssh.*;+import io.onedev.server.storage.DefaultStorageManager;+import io.onedev.server.storage.StorageManager;import io.onedev.server.terminal.DefaultTerminalManager;import io.onedev.server.terminal.TerminalManager;import io.onedev.server.util.ScriptContribution;@@ -289,6 +291,7 @@ public class CoreModule extends AbstractPluginModule {bind(BuildLabelManager.class).to(DefaultBuildLabelManager.class);bind(PullRequestLabelManager.class).to(DefaultPullRequestLabelManager.class);bind(ClusterManager.class).to(DefaultClusterManager.class);+ bind(StorageManager.class).to(DefaultStorageManager.class);bind(WebHookManager.class);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.javaindex a1167d4d0f..dee405a77d 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java@@ -1,25 +1,24 @@package io.onedev.server.buildspec.step;-import java.io.File;-import java.util.List;-import java.util.Map;--import javax.validation.constraints.NotEmpty;-import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.TaskLogger;import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.annotation.Patterns;+import io.onedev.server.annotation.SafePath;import io.onedev.server.buildspec.BuildSpec;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.patternset.PatternSet;-import io.onedev.server.annotation.SafePath;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.annotation.Patterns;++import javax.validation.constraints.NotEmpty;+import java.io.File;+import java.util.List;+import java.util.Map;@Editable(order=1050, name="Publish Artifacts")public class PublishArtifactStep extends ServerSideStep {@@ -71,7 +70,7 @@ public class PublishArtifactStep extends ServerSideStep {public Map<String, byte[]> run(Build build, File inputDir, TaskLogger jobLogger) {LockUtils.write(build.getArtifactsLockName(), () -> {var projectId = build.getProject().getId();- OneDev.getInstance(BuildManager.class).initArtifactsDir(projectId, build.getNumber());+ OneDev.getInstance(StorageManager.class).initArtifactsDir(projectId, build.getNumber());FileUtils.copyDirectory(inputDir, build.getArtifactsDir());OneDev.getInstance(ProjectManager.class).directoryModified(projectId, build.getArtifactsDir());return null;diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.javaindex e91dd7e4ed..c1f3b6a0b6 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterManager.java@@ -3,11 +3,13 @@ package io.onedev.server.cluster;import com.hazelcast.cluster.Member;import com.hazelcast.core.HazelcastInstance;import com.hazelcast.cp.IAtomicLong;+import io.onedev.server.replica.ProjectReplica;import javax.annotation.Nullable;import java.util.Collection;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.Future;@@ -66,4 +68,9 @@ public interface ClusterManager {List<String> getServerAddresses();+ void redistributeProjects(Map<Long, Map<String, ProjectReplica>> replicas);++ Map<String, ProjectReplica> addProject(Map<Long, Map<String, ProjectReplica>> replicas, Long projectId);++ boolean isClusteringSupported();}diff --git a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.javaindex 3f415bb82f..3b177b72e4 100644--- a/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java+++ b/server-core/src/main/java/io/onedev/server/cluster/ClusterResource.java@@ -19,6 +19,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.concurrent.PrioritizedRunnable;import io.onedev.server.util.concurrent.WorkExecutor;import io.onedev.server.util.patternset.PatternSet;@@ -42,6 +43,7 @@ import static io.onedev.commons.utils.FileUtils.tar;import static io.onedev.commons.utils.LockUtils.read;import static io.onedev.commons.utils.LockUtils.write;import static io.onedev.server.model.Build.getArtifactsLockName;+import static io.onedev.server.model.Project.SHARE_TEST_DIR;import static javax.ws.rs.core.Response.Status.NO_CONTENT;import static javax.ws.rs.core.Response.ok;import static javax.ws.rs.core.Response.status;@@ -54,26 +56,26 @@ public class ClusterResource {private final ProjectManager projectManager;- private final BuildManager buildManager;-private final AttachmentManager attachmentManager;private final CommitInfoManager commitInfoManager;private final VisitInfoManager visitInfoManager;+ private final StorageManager storageManager;+private final WorkExecutor workExecutor;@Inject- public ClusterResource(ProjectManager projectManager, BuildManager buildManager,- CommitInfoManager commitInfoManager, AttachmentManager attachmentManager,- VisitInfoManager visitInfoManager, WorkExecutor workExecutor) {+ public ClusterResource(ProjectManager projectManager, CommitInfoManager commitInfoManager,+ AttachmentManager attachmentManager, VisitInfoManager visitInfoManager,+ WorkExecutor workExecutor, StorageManager storageManager) {this.commitInfoManager = commitInfoManager;this.projectManager = projectManager;- this.buildManager = buildManager;this.workExecutor = workExecutor;this.attachmentManager = attachmentManager;this.visitInfoManager = visitInfoManager;+ this.storageManager = storageManager;}@Path("/project-files")@@ -89,6 +91,7 @@ public class ClusterResource {StreamingOutput os = output -> read(readLock, () -> {File directory = new File(projectManager.getStorageDir(projectId), path);PatternSet patternSet = PatternSet.parse(patterns);+ patternSet.getExcludes().add(SHARE_TEST_DIR + "/**");tar(directory, patternSet.getIncludes(), patternSet.getExcludes(), output, false);return null;});@@ -141,6 +144,7 @@ public class ClusterResource {StreamingOutput os = output -> read(getArtifactsLockName(projectId, buildNumber), () -> {File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);PatternSet patternSet = PatternSet.parse(artifacts);+ patternSet.getExcludes().add(SHARE_TEST_DIR + "/**");tar(artifactsDir, patternSet.getIncludes(), patternSet.getExcludes(), output, false);return null;});@@ -367,7 +371,7 @@ public class ClusterResource {throw new UnauthorizedException("This api can only be accessed via cluster credential");write(getArtifactsLockName(projectId, buildNumber), () -> {- buildManager.initArtifactsDir(projectId, buildNumber);+ storageManager.initArtifactsDir(projectId, buildNumber);var artifactsDir = Build.getArtifactsDir(projectId, buildNumber);File artifactFile = new File(artifactsDir, artifactPath);FileUtils.createDir(artifactFile.getParentFile());diff --git a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.javaindex 178ec94919..4bdee24e58 100644--- a/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java+++ b/server-core/src/main/java/io/onedev/server/cluster/DefaultClusterManager.java@@ -19,6 +19,7 @@ import io.onedev.server.event.cluster.ConnectionRestored;import io.onedev.server.model.ClusterServer;import io.onedev.server.persistence.DataManager;import io.onedev.server.persistence.HibernateConfig;+import io.onedev.server.replica.ProjectReplica;import javax.inject.Inject;import javax.inject.Singleton;@@ -36,6 +37,7 @@ import java.util.concurrent.Future;import static io.onedev.server.model.AbstractEntity.PROP_ID;import static io.onedev.server.model.ClusterServer.PROP_ADDRESS;+import static io.onedev.server.replica.ProjectReplica.Type.PRIMARY;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.Collections.max;import static java.util.stream.Collectors.toList;@@ -364,5 +366,25 @@ public class DefaultClusterManager implements ClusterManager {return getHazelcastInstance().getCluster().getMembers().stream().map(this::getServerAddress).collect(toList());}++ @Override+ public void redistributeProjects(Map<Long, Map<String, ProjectReplica>> replicas) {+ throw new UnsupportedOperationException();+ }++ @Override+ public Map<String, ProjectReplica> addProject(Map<Long, Map<String, ProjectReplica>> replicas, Long projectId) {+ var replicasOfProject = new HashMap<String, ProjectReplica>();+ var replica = new ProjectReplica();+ replica.setType(PRIMARY);+ replica.setVersion(0);+ replicasOfProject.put(getLocalServerAddress(), replica);+ return replicasOfProject;+ }++ @Override+ public boolean isClusteringSupported() {+ return false;+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 92e22a08d1..93de68661d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -98,6 +98,4 @@ public interface BuildManager extends EntityManager<Build> {File getStorageDir(Long projectId, Long buildNumber);- void initArtifactsDir(Long projectId, Long buildNumber);-}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.javaindex f37dee9e95..b01138cb75 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardManager.java@@ -13,6 +13,10 @@ public interface DashboardManager extends EntityManager<Dashboard> {List<Dashboard> queryAccessible(@Nullable User user);+ void create(Dashboard dashboard);++ void update(Dashboard dashboard);+@NullableDashboard find(User owner, String name);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.javaindex 01ffe5ad5f..ae37cf5504 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/DashboardVisitManager.java@@ -5,4 +5,7 @@ import io.onedev.server.persistence.dao.EntityManager;public interface DashboardVisitManager extends EntityManager<DashboardVisit> {+ void create(DashboardVisit visit);++ void update(DashboardVisit visit);}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex f121ca856f..c69e386c5f 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@@ -163,8 +163,6 @@ public interface ProjectManager extends EntityManager<Project> {*/File getInfoDir(Long projectId);- void initLfsDir(Long projectId);-/*** Get directory to store attachments of specified project*diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex d5825642fd..dafc50051b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -35,6 +35,7 @@ import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;@@ -71,9 +72,11 @@ import java.util.*;import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;+import static edu.emory.mathcs.backport.java.util.Collections.sort;import static io.onedev.commons.utils.LockUtils.write;import static io.onedev.server.model.Build.*;import static io.onedev.server.model.Project.BUILDS_DIR;+import static io.onedev.server.model.Project.SHARE_TEST_DIR;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;import static java.lang.Long.valueOf;@@ -102,6 +105,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate final ClusterManager clusterManager;+ private final StorageManager storageManager;+private final Set<BuildStorageSyncer> storageSyncers;private final SequenceGenerator numberGenerator;@@ -114,10 +119,11 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Injectpublic DefaultBuildManager(Dao dao, BuildParamManager buildParamManager,- TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,- ProjectManager projectManager, SessionManager sessionManager,- TransactionManager transactionManager, SettingManager settingManager,- ClusterManager clusterManager, Set<BuildStorageSyncer> storageSyncers) {+ TaskScheduler taskScheduler, BuildDependenceManager buildDependenceManager,+ ProjectManager projectManager, SessionManager sessionManager,+ TransactionManager transactionManager, SettingManager settingManager,+ ClusterManager clusterManager, StorageManager storageManager,+ Set<BuildStorageSyncer> storageSyncers) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;@@ -127,6 +133,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buithis.transactionManager = transactionManager;this.settingManager = settingManager;this.clusterManager = clusterManager;+ this.storageManager = storageManager;this.storageSyncers = storageSyncers;numberGenerator = new SequenceGenerator(Build.class, clusterManager, dao);@@ -978,7 +985,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiList<ArtifactInfo> children = new ArrayList<>();int baseLen = artifactsDir.getAbsolutePath().length() + 1;for (File child : artifactFile.listFiles()) {- if (!isVersionFile(child)) {+ if (!isVersionFile(child) && !child.getName().equals(SHARE_TEST_DIR)) {var relativePath = child.getAbsolutePath().substring(baseLen);if (child.isFile()) {children.add(new FileInfo(relativePath, child.lastModified(),@@ -988,7 +995,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}}}- Collections.sort(children, (Comparator<ArtifactInfo>) (o1, o2) -> {+ sort(children, (Comparator<ArtifactInfo>) (o1, o2) -> {if (o1 instanceof FileInfo && o2 instanceof FileInfo|| (o1 instanceof DirectoryInfo) && (o2 instanceof DirectoryInfo)) {return o1.getPath().compareTo(o2.getPath());@@ -1038,11 +1045,26 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiprojectManager.syncDirectory(projectId, BUILDS_DIR, (suffix) -> {projectManager.syncDirectory(projectId, BUILDS_DIR + "/" + suffix, (buildNumberString) -> {var buildNumber = valueOf(buildNumberString);- var buildPath = getProjectRelativePath(buildNumber);- projectManager.syncFile(projectId, buildPath + "/" + PATH_LOG,+ var buildPath = getProjectRelativeStoragePath(buildNumber);+ projectManager.syncFile(projectId, buildPath + "/" + LOG_FILE,getLogLockName(projectId, buildNumber), activeServer);- projectManager.syncDirectory(projectId, buildPath + "/" + PATH_ARTIFACTS,- getArtifactsLockName(projectId, buildNumber), activeServer);+ storageManager.initArtifactsDir(projectId, buildNumber);+ var artifactsDir = Build.getArtifactsDir(projectId, buildNumber);+ boolean artifactsDirShared;+ var testFile = new File(artifactsDir, SHARE_TEST_DIR + "/" + UUID.randomUUID());+ FileUtils.touchFile(testFile);+ try {+ artifactsDirShared = clusterManager.runOnServer(activeServer, () -> {+ var remoteArtifactsDir = Build.getArtifactsDir(projectId, buildNumber);+ return new File(remoteArtifactsDir, SHARE_TEST_DIR + "/" + testFile.getName()).exists();+ });+ } finally {+ FileUtils.deleteFile(testFile);+ }+ if (!artifactsDirShared) {+ projectManager.syncDirectory(projectId, buildPath + "/" + ARTIFACTS_DIR,+ getArtifactsLockName(projectId, buildNumber), activeServer);+ }storageSyncers.forEach(it->it.sync(projectId, buildNumber, activeServer));}, activeServer);}, activeServer);@@ -1050,13 +1072,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Overridepublic File getStorageDir(Long projectId, Long buildNumber) {- return projectManager.getSubDir(projectId, Build.getProjectRelativePath(buildNumber));- }-- @Override- public void initArtifactsDir(Long projectId, Long buildNumber) {- File buildDir = getStorageDir(projectId, buildNumber);- FileUtils.createDir(new File(buildDir, Build.PATH_ARTIFACTS));+ return projectManager.getSubDir(projectId, Build.getProjectRelativeStoragePath(buildNumber));}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.javaindex c96c752d7b..ace6f0acc5 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardManager.java@@ -12,6 +12,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import javax.persistence.criteria.Subquery;+import com.google.common.base.Preconditions;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;@@ -91,6 +92,17 @@ public class DefaultDashboardManager extends BaseEntityManager<Dashboard> implemreturn query.getResultList();}+ @Override+ public void create(Dashboard dashboard) {+ Preconditions.checkState(dashboard.isNew());+ dao.persist(dashboard);+ }++ @Override+ public void update(Dashboard dashboard) {+ Preconditions.checkState(!dashboard.isNew());+ }+@Overridepublic Dashboard find(User owner, String name) {EntityCriteria<Dashboard> criteria = EntityCriteria.of(Dashboard.class);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.javaindex a60fbe9e71..a1590f6814 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultDashboardVisitManager.java@@ -5,6 +5,7 @@ import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;+import com.google.common.base.Preconditions;import io.onedev.server.entitymanager.DashboardVisitManager;import io.onedev.server.model.DashboardVisit;import io.onedev.server.persistence.dao.BaseEntityManager;@@ -28,5 +29,17 @@ public class DefaultDashboardVisitManager extends BaseEntityManager<DashboardVispublic int count() {return count(true);}-++ @Override+ public void create(DashboardVisit visit) {+ Preconditions.checkState(visit.isNew());+ dao.persist(visit);+ }++ @Override+ public void update(DashboardVisit visit) {+ Preconditions.checkState(!visit.isNew());+ dao.persist(visit);+ }+}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.javaindex dfa4a6f14b..799ff348bf 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@@ -14,6 +14,7 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.command.Commandline;import io.onedev.commons.utils.command.LineConsumer;import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.server.OneDev;import io.onedev.server.attachment.AttachmentManager;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.cluster.ClusterTask;@@ -58,6 +59,7 @@ import io.onedev.server.search.entity.issue.IssueQueryUpdater;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.IOUtils;import io.onedev.server.util.ProjectNameReservation;import io.onedev.server.util.artifact.ArtifactInfo;@@ -115,8 +117,6 @@ import static io.onedev.server.git.CommandUtils.callWithClusterCredential;import static io.onedev.server.git.GitUtils.*;import static io.onedev.server.model.Project.*;import static io.onedev.server.replica.ProjectReplica.Type.*;-import static io.onedev.server.replica.ReplicaUtils.addProject;-import static io.onedev.server.replica.ReplicaUtils.redistributeProjects;import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;import static io.onedev.server.util.DirectoryVersionUtils.*;import static io.onedev.server.util.criteria.Criteria.forManyValues;@@ -133,7 +133,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private static final String DELETE_MARK = "to-be-deleted-when-onedev-is-restarted";- private static final String LFS_SINCE_COMMITS = ".lfs-since-commits";+ private static final String LFS_SINCE_COMMITS = "lfs/.lfs-since-commits";private static final int SYNC_PRIORITY = 40;@@ -179,6 +179,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private final VisitInfoManager visitInfoManager;+ private final StorageManager storageManager;+private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml", "sitemap.txt","favicon.ico", "favicon.png", "logo.png", "wicket", "projects");@@ -202,7 +204,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>ClusterManager clusterManager, GitService gitService, TaskScheduler taskScheduler,ProjectLastEventDateManager lastEventDateManager, PullRequestManager pullRequestManager,AttachmentManager attachmentManager, BatchWorkManager batchWorkManager,- VisitInfoManager visitInfoManager, Set<ProjectNameReservation> nameReservations) {+ VisitInfoManager visitInfoManager, StorageManager storageManager,+ Set<ProjectNameReservation> nameReservations) {super(dao);this.commitInfoManager = commitInfoManager;@@ -225,6 +228,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>this.attachmentManager = attachmentManager;this.batchWorkManager = batchWorkManager;this.visitInfoManager = visitInfoManager;+ this.storageManager = storageManager;for (ProjectNameReservation reservation : nameReservations)reservedNames.addAll(reservation.getReserved());@@ -322,11 +326,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>authorization.setRole(roleManager.getOwner());userAuthorizationManager.create(authorization);- var servers = new HashSet<>(clusterManager.getServerAddresses());Long projectId = project.getId();- Map<String, ProjectReplica> replicasOfProject = addProject(- new HashMap<>(replicas), servers,- settingManager.getClusterSetting().getReplicaCount(), projectId);+ Map<String, ProjectReplica> replicasOfProject = clusterManager.addProject(+ new HashMap<>(replicas), projectId);var gitPackConfig = project.getGitPackConfig();for (var entry: replicasOfProject.entrySet()) {var replica = entry.getValue();@@ -551,7 +553,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>if (fromActiveServer.equals(clusterManager.getLocalServerAddress())) {File fromGitDir = getGitDir(fromId);new CloneCommand(toGitDir, fromGitDir.getAbsolutePath()).noLfs(true).mirror(true).run();- initLfsDir(toId);+ storageManager.initLfsDir(toId);if (withLfs)// Use origin instead of real url as otherwise the command will// report EOF error when fetch from a local path@@ -570,7 +572,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return null;});- initLfsDir(toId);+ storageManager.initLfsDir(toId);if (withLfs) {callWithClusterCredential(git -> {@@ -605,7 +607,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>File gitDir = getGitDir(projectId);cleanDir(gitDir);new CloneCommand(gitDir, repositoryUrl).mirror(true).noLfs(true).run();- initLfsDir(projectId);+ storageManager.initLfsDir(projectId);new LfsFetchAllCommand(gitDir, repositoryUrl).run();return null;});@@ -646,16 +648,16 @@ public class DefaultProjectManager extends BaseEntityManager<Project>} catch (Exception e) {throw ExceptionUtils.unchecked(e);}- initLfsDir(projectId);+ storageManager.initLfsDir(projectId);} else if (!isValid(gitDir)) {logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");cleanDir(gitDir);- initLfsDir(projectId);+ storageManager.initLfsDir(projectId);try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {} catch (Exception e) {throw ExceptionUtils.unchecked(e);}- initLfsDir(projectId);+ storageManager.initLfsDir(projectId);}}@@ -1248,16 +1250,14 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Overridepublic void redistributeReplicas() {var snapshot = new HashMap<>(replicas);- var servers = new HashSet<>(clusterManager.getServerAddresses());- int replicaCount = settingManager.getClusterSetting().getReplicaCount();- redistributeProjects(snapshot, servers, replicaCount);- for (var projectToReplicas: snapshot.entrySet()) {- var projectId = projectToReplicas.getKey();+ clusterManager.redistributeProjects(snapshot);+ for (var newProjectToReplicas: snapshot.entrySet()) {+ var projectId = newProjectToReplicas.getKey();var project = cache.get(projectId);while (true) {var replicasOfProject = replicas.get(projectId);if (project != null && replicasOfProject != null) {- var newReplicasOfProject = projectToReplicas.getValue();+ var newReplicasOfProject = newProjectToReplicas.getValue();for (var newServerToReplica: newReplicasOfProject.entrySet()) {var server = newServerToReplica.getKey();var newReplica = newServerToReplica.getValue();@@ -1277,13 +1277,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}}- // Add back temporarily disconnected server replicas- for (var serverToReplica: replicasOfProject.entrySet()) {- var server = serverToReplica.getKey();- var replica = serverToReplica.getValue();- if (!servers.contains(server))- newReplicasOfProject.put(server, replica);- }if (replicasOfProject.equals(newReplicasOfProject)) {break;} else if (replicas.replace(projectId, replicasOfProject, newReplicasOfProject)) {@@ -1348,7 +1341,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>public Map<String, ProjectReplica> getReplicas(Long projectId) {return replicas.get(projectId);}-+private void updateReplicaVersion(Long projectId) {var projectDir = getStorageDir(projectId);while (true) {@@ -1623,28 +1616,44 @@ public class DefaultProjectManager extends BaseEntityManager<Project>git.clearArgs();if (withLfs) {- var sinceCommitIds = readLfsSinceCommits(projectId);- var untilCommitIds = new HashSet<ObjectId>();- for (Ref ref: repository.getRefDatabase().getRefs())- untilCommitIds.add(ref.getObjectId());-- if (sinceCommitIds.isEmpty()) {- new LfsFetchAllCommand(git.workingDir(), fetchUrl) {- @Override- protected Commandline newGit() {- return git;- }- }.run();+ storageManager.initLfsDir(projectId);+ var lfsDir = new File(git.workingDir(), "lfs");+ boolean lfsDirShared;+ var testFile = new File(lfsDir, SHARE_TEST_DIR + "/" + UUID.randomUUID());+ FileUtils.touchFile(testFile);+ try {+ lfsDirShared = clusterManager.runOnServer(activeServer,+ new SharedLfsDirTester(projectId, testFile.getName()));+ } finally {+ FileUtils.deleteFile(testFile);+ }++ if (lfsDirShared) {+ fetch(git, fetchUrl);} else {- var fetchCommitIds = new ArrayList<>(getReachableCommits(repository, sinceCommitIds, untilCommitIds));- new LfsFetchCommand(git.workingDir(), fetchUrl, fetchCommitIds) {- @Override- protected Commandline newGit() {- return git;- }- }.run();+ var sinceCommitIds = readLfsSinceCommits(projectId);+ var untilCommitIds = new HashSet<ObjectId>();+ for (Ref ref: repository.getRefDatabase().getRefs())+ untilCommitIds.add(ref.getObjectId());++ if (sinceCommitIds.isEmpty()) {+ new LfsFetchAllCommand(git.workingDir(), fetchUrl) {+ @Override+ protected Commandline newGit() {+ return git;+ }+ }.run();+ } else {+ var fetchCommitIds = new ArrayList<>(getReachableCommits(repository, sinceCommitIds, untilCommitIds));+ new LfsFetchCommand(git.workingDir(), fetchUrl, fetchCommitIds) {+ @Override+ protected Commandline newGit() {+ return git;+ }+ }.run();+ }+ writeLfsSinceCommits(projectId, untilCommitIds);}- writeLfsSinceCommits(projectId, untilCommitIds);} else {fetch(git, fetchUrl);}@@ -1710,11 +1719,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>public File getAttachmentDir(Long projectId) {return getSubDir(projectId, ATTACHMENT_DIR);}-- @Override- public void initLfsDir(Long projectId) {- FileUtils.createDir(new File(getGitDir(projectId), "lfs"));- }@Overridepublic void execute() {@@ -1789,7 +1793,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return CronScheduleBuilder.dailyAtHourAndMinute(3, 0);}- static class SyncWork extends Prioritized {+ private static class SyncWork extends Prioritized {final String syncWithServer;@@ -1800,4 +1804,24 @@ public class DefaultProjectManager extends BaseEntityManager<Project>}+ private static class SharedLfsDirTester implements ClusterTask<Boolean> {++ Long projectId;++ String fileName;++ SharedLfsDirTester(Long projectId, String fileName) {+ this.projectId = projectId;+ this.fileName = fileName;+ }++ @Override+ public Boolean call() throws IOException {+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);+ var remoteLfsDir = new File(projectManager.getGitDir(projectId), "lfs");+ return new File(remoteLfsDir, SHARE_TEST_DIR + "/" + fileName).exists();+ }++ };+}diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex 4fe508b811..0349a82580 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -9,6 +9,7 @@ import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.git.exception.ObsoleteCommitException;import io.onedev.server.git.exception.RefUpdateException;import io.onedev.server.git.service.DiffEntryFacade;+import io.onedev.server.git.service.RefFacade;import io.onedev.server.git.signature.*;import io.onedev.server.util.GpgUtils;import org.bouncycastle.bcpg.ArmoredOutputStream;@@ -46,13 +47,14 @@ import org.slf4j.LoggerFactory;import javax.annotation.Nullable;import java.io.*;import java.util.*;+import java.util.stream.Collectors;public class GitUtils {public static final int SHORT_SHA_LENGTH = 8;-+private static final Logger logger = LoggerFactory.getLogger(GitUtils.class);-+public static boolean isEmptyPath(String path) {return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);}@@ -70,9 +72,9 @@ public class GitUtils {public static String getDefaultBranch(Repository repository) {try {Ref headRef = repository.findRef("HEAD");- if (headRef != null- && headRef.isSymbolic()- && headRef.getTarget().getName().startsWith(Constants.R_HEADS)+ if (headRef != null+ && headRef.isSymbolic()+ && headRef.getTarget().getName().startsWith(Constants.R_HEADS)&& headRef.getObjectId() != null) {return Repository.shortenRefName(headRef.getTarget().getName());} else {@@ -82,12 +84,17 @@ public class GitUtils {throw new RuntimeException(e);}}-++ public static void setDefaultBranch(Repository repository, String defaultBranch) {+ RefUpdate refUpdate = getRefUpdate(repository, "HEAD");+ linkRef(refUpdate, branch2ref(defaultBranch));+ }+public static List<DiffEntry> diff(Repository repository, AnyObjectId oldRevId, AnyObjectId newRevId) {List<DiffEntry> diffs = new ArrayList<>();try (DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);- RevWalk revWalk = new RevWalk(repository);- ObjectReader reader = repository.newObjectReader();) {+ RevWalk revWalk = new RevWalk(repository);+ ObjectReader reader = repository.newObjectReader();) {diffFormatter.setRepository(repository);diffFormatter.setDetectRenames(true);diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);@@ -113,7 +120,7 @@ public class GitUtils {}return diffs;}-+public static InputStream getInputStream(Repository repository, ObjectId revId, String path) {try (RevWalk revWalk = new RevWalk(repository)) {RevTree revTree = revWalk.parseCommit(revId).getTree();@@ -128,7 +135,7 @@ public class GitUtils {throw new RuntimeException(e);}}-+@Nullablepublic static RevCommit getLastCommit(Repository repository) {RevCommit lastCommit = null;@@ -174,7 +181,7 @@ public class GitUtils {/*** Parse the original git raw date to Java date. The raw git date is in unix* timestamp with timezone like: 1392312299 -0800- *+ ** @param input the input raw date string* @return Java date*/@@ -223,7 +230,7 @@ public class GitUtils {/*** Convert a git reference name to branch name.- *+ ** @param refName name of the git reference* @return name of the branch, or <tt>null</tt> if specified ref does not* represent a branch@@ -241,7 +248,7 @@ public class GitUtils {/*** Convert a git reference name to tag name.- *+ ** @param refName name of the git reference* @return name of the tag, or <tt>null</tt> if specified ref does not represent* a tag@@ -267,6 +274,24 @@ public class GitUtils {return blobIdent;}+ public static Collection<ObjectId> getReachableCommits(Repository repository,+ Collection<ObjectId> sinceCommits,+ Collection<ObjectId> untilCommits) {+ try (RevWalk revWalk = new RevWalk(repository)) {+ var reachableCommits = new HashSet<ObjectId>();+ for (var commitId: untilCommits)+ revWalk.markStart(revWalk.parseCommit(commitId));+ for (var commitId: sinceCommits)+ revWalk.markUninteresting(revWalk.parseCommit(commitId));+ RevCommit commit;+ while ((commit = revWalk.next()) != null)+ reachableCommits.add(commit.copy());+ return reachableCommits;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+public static BlobIdent getNewBlobIdent(DiffEntryFacade diffEntry, String newRev) {BlobIdent blobIdent;if (diffEntry.getChangeType() != ChangeType.DELETE) {@@ -297,7 +322,7 @@ public class GitUtils {}public static boolean isMergedInto(Repository repository, @Nullable Map<String, String> gitEnvs, ObjectId base,- ObjectId tip) {+ ObjectId tip) {if (gitEnvs != null && !gitEnvs.isEmpty()) {return new IsAncestorCommand(repository.getDirectory(), base.name(), tip.name(), gitEnvs).run();} else {@@ -317,7 +342,7 @@ public class GitUtils {/*** Get commit of specified revision id.- *+ ** @param revWalk* @param revId* @return <tt>null</tt> if specified id does not exist or does not represent a@@ -339,6 +364,22 @@ public class GitUtils {}}+ public static Collection<RefFacade> getCommitRefs(Repository repository, @Nullable String prefix) {+ try (RevWalk revWalk = new RevWalk(repository)) {+ List<Ref> refs;+ if (prefix != null)+ refs = repository.getRefDatabase().getRefsByPrefix(prefix);+ else+ refs = repository.getRefDatabase().getRefs();+ return refs.stream()+ .map(ref->new RefFacade(revWalk, ref))+ .filter(refInfo->refInfo.getPeeledObj() instanceof RevCommit)+ .collect(Collectors.toSet());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+@Nullablepublic static ObjectId resolve(Repository repository, String revision, boolean errorIfInvalid) {try {@@ -393,8 +434,8 @@ public class GitUtils {@Nullablepublic static ObjectId merge(Repository repository, ObjectId targetCommitId, ObjectId sourceCommitId,- boolean squash, PersonIdent committer, PersonIdent author, String commitMessage,- boolean useOursOnConflict) {+ boolean squash, PersonIdent committer, PersonIdent author, String commitMessage,+ boolean useOursOnConflict) {try (RevWalk revWalk = new RevWalk(repository); ObjectInserter inserter = repository.newObjectInserter();) {RevCommit sourceCommit = revWalk.parseCommit(sourceCommitId);RevCommit targetCommit = revWalk.parseCommit(targetCommitId);@@ -425,7 +466,7 @@ public class GitUtils {}public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId,- ObjectId newCommitId) {+ ObjectId newCommitId) {Collection<String> changedFiles = new HashSet<>();try (RevWalk revWalk = new RevWalk(repository); TreeWalk treeWalk = new TreeWalk(repository)) {treeWalk.setFilter(TreeFilter.ANY_DIFF);@@ -496,7 +537,7 @@ public class GitUtils {throw new RuntimeException(e);}}-+public static void sign(ObjectBuilder object, PGPSecretKeyRing signingKey) {JcePBESecretKeyDecryptorBuilder decryptorBuilder = new JcePBESecretKeyDecryptorBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME);@@ -507,9 +548,9 @@ public class GitUtils {} catch (PGPException e) {throw new RuntimeException(e);}-+PGPPublicKey publicKey = signingKey.getPublicKey();-+PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator(new JcaPGPContentSignerBuilder(publicKey.getAlgorithm(), HashAlgorithmTags.SHA256).setProvider(BouncyCastleProvider.PROVIDER_NAME));@@ -517,26 +558,26 @@ public class GitUtils {signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey);PGPSignatureSubpacketGenerator subpackets = new PGPSignatureSubpacketGenerator();subpackets.setIssuerFingerprint(false, publicKey);-+String emailAddress = GpgUtils.getEmailAddress(publicKey.getUserIDs().next());subpackets.addSignerUserID(false, emailAddress);-+signatureGenerator.setHashedSubpackets(subpackets.generate());ByteArrayOutputStream buffer = new ByteArrayOutputStream();try (BCPGOutputStream out = new BCPGOutputStream(new ArmoredOutputStream(buffer))) {signatureGenerator.update(object.build());signatureGenerator.generate().encode(out);}- object.setGpgSignature(new GpgSignature(buffer.toByteArray()));+ object.setGpgSignature(new GpgSignature(buffer.toByteArray()));} catch (IOException | PGPException e) {throw new RuntimeException(e);}}-+@Nullable- public static SignatureVerification verifyTagSignature(byte[] raw,- SignatureVerificationKeyLoader keyLoader) {- byte[] signatureData = TagParser.getRawGpgSignature(raw);+ public static SignatureVerification verifyTagSignature(byte[] raw,+ SignatureVerificationKeyLoader keyLoader) {+ byte[] signatureData = TagParser.getRawGpgSignature(raw);if (signatureData == null) {return null;}@@ -544,27 +585,27 @@ public class GitUtils {// The signature is just tacked onto the end of the message, which// is last in the buffer.byte[] data = Arrays.copyOfRange(raw, 0, raw.length - signatureData.length);-+PersonIdent taggerIdent = TagParser.getTaggerIdent(raw);if (taggerIdent == null)return null;-+return verify(data, signatureData, taggerIdent.getEmailAddress(), keyLoader);}-+/** Most logic here is copied from JGit*/@Nullable- public static SignatureVerification verifyCommitSignature(byte[] raw,- SignatureVerificationKeyLoader keyLoader) {+ public static SignatureVerification verifyCommitSignature(byte[] raw,+ SignatureVerificationKeyLoader keyLoader) {byte[] header = {'g', 'p', 'g', 's', 'i', 'g'};int start = RawParseUtils.headerStart(header, raw, 0);if (start < 0)return null;int end = RawParseUtils.headerEnd(raw, start);byte[] signatureData = Arrays.copyOfRange(raw, start, end);-+// start is at the beginning of the header's contentstart -= header.length + 1;// end is on the terminating LF; we need to skip that, too@@ -582,7 +623,7 @@ public class GitUtils {String emailAddress = committerIdent.getEmailAddress();return verify(data, signatureData, emailAddress, keyLoader);}-+@Nullablepublic static SignatureVerification verifySignature(RevObject object, SignatureVerificationKeyLoader keyLoader) {if (object instanceof RevCommit) {@@ -611,8 +652,8 @@ public class GitUtils {}@Nullable- private static SignatureVerification verify(byte[] data, byte[] signatureData, String dataWriter,- SignatureVerificationKeyLoader keyLoader) {+ private static SignatureVerification verify(byte[] data, byte[] signatureData, String dataWriter,+ SignatureVerificationKeyLoader keyLoader) {try (InputStream sigIn = new ByteArrayInputStream(signatureData)) {PGPSignature signature = parseSignature(sigIn);if (signature != null) {@@ -624,9 +665,9 @@ public class GitUtils {key.getPublicKey());signature.update(data);if (signature.verify()) {- if (!key.shouldVerifyDataWriter() || key.getEmailAddresses().contains(dataWriter))+ if (!key.shouldVerifyDataWriter() || key.getEmailAddresses().contains(dataWriter))return new SignatureVerified(key);- else+ elsereturn new SignatureUnverified(key, "Can not verify committer email using signing key");} else {return new SignatureUnverified(key, "Invalid commit signature");@@ -649,12 +690,12 @@ public class GitUtils {throw new RuntimeException(e2);}}-+/** Copied from JGit*/private static class TagParser {-+private static final byte[] hSignature = Constants.encodeASCII("-----BEGIN PGP SIGNATURE-----");private static int nextStart(byte[] prefix, byte[] buffer, int from) {@@ -703,7 +744,7 @@ public class GitUtils {}return start;}-+private static byte[] getRawGpgSignature(byte[] raw) {int start = getSignatureStart(raw);if (start < 0) {@@ -718,7 +759,7 @@ public class GitUtils {return null;return RawParseUtils.parsePersonIdent(raw, nameB);}-+}-+}diff --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 738371cad2..cc648408ad 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@@ -1383,6 +1383,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizFile artifactsDir = dependency.getArtifactsDir();if (artifactsDir.exists()) {PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());+ patternSet.getExcludes().add(Project.SHARE_TEST_DIR + "/**");int baseLen = artifactsDir.getAbsolutePath().length() + 1;for (File file : FileUtils.listFiles(artifactsDir, patternSet.getIncludes(), patternSet.getExcludes())) {FileUtils.copyFile(file,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 9867bb9a5a..9b1cd54e84 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@@ -77,9 +77,9 @@ public class Build extends ProjectBelongingprivate static final long serialVersionUID = 1L;- public static final String PATH_ARTIFACTS = "artifacts";+ public static final String ARTIFACTS_DIR = "artifacts";- public static final String PATH_LOG = "build.log";+ public static final String LOG_FILE = "build.log";public static final int MAX_DESCRIPTION_LEN = 12000;@@ -184,15 +184,15 @@ public class Build extends ProjectBelongingpublic static File getLogFile(Long projectId, Long buildNumber) {File buildDir = OneDev.getInstance(BuildManager.class).getStorageDir(projectId, buildNumber);- return new File(buildDir, PATH_LOG);+ return new File(buildDir, LOG_FILE);}- public static String getProjectRelativePath(Long buildNumber) {- return BUILDS_DIR + "/" + String.format("%03d", buildNumber%1000) + "/" + buildNumber;+ public static String getProjectRelativeStoragePath(Long buildNumber) {+ return BUILDS_DIR + "/" + getStoragePath(buildNumber);}- public String getProjectRelativePath() {- return getProjectRelativePath(getNumber());+ public static String getStoragePath(Long buildNumber) {+ return String.format("%03d", buildNumber%1000) + "/" + buildNumber;}public File getLogFile() {@@ -797,7 +797,7 @@ public class Build extends ProjectBelonging}public static File getArtifactsDir(Long projectId, Long buildNumber) {- return new File(getStorageDir(projectId, buildNumber), PATH_ARTIFACTS);+ return new File(getStorageDir(projectId, buildNumber), ARTIFACTS_DIR);}@Nullablediff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex ee9558d875..dece5f3c24 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -101,6 +101,8 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic static String SITE_DIR = "site";+ public static String SHARE_TEST_DIR = ".onedev-share-test";+public static final int MAX_DESCRIPTION_LEN = 15000;public static final String NAME_NAME = "Name";diff --git a/server-core/src/main/java/io/onedev/server/replica/ReplicaUtils.java b/server-core/src/main/java/io/onedev/server/replica/ReplicaUtils.javadeleted file mode 100644index 062592c23a..0000000000--- a/server-core/src/main/java/io/onedev/server/replica/ReplicaUtils.java+++ /dev/null@@ -1,213 +0,0 @@-package io.onedev.server.replica;--import io.onedev.server.replica.ProjectReplica.Type;--import java.util.*;--import static io.onedev.server.replica.ProjectReplica.Type.*;-import static java.util.Collections.reverse;-import static java.util.Comparator.comparing;-import static java.util.Comparator.comparingInt;--public class ReplicaUtils {-- public static void redistributeProjects(Map<Long, Map<String, ProjectReplica>> replicas,- Set<String> servers, int replicaCount) {- // Normalize distributions- for (var entry: replicas.values()) {- entry.entrySet().removeIf(it -> !servers.contains(it.getKey()));- var replicasOfProject = new ArrayList<>(entry.values());- replicasOfProject.sort(comparing(ProjectReplica::getVersion));- reverse(replicasOfProject);- var primaryFound = false;- for (var replica : replicasOfProject) {- if (replica.getType() == PRIMARY) {- if (primaryFound)- replica.setType(BACKUP);- else- primaryFound = true;- }- }- if (!primaryFound) {- if (!replicasOfProject.isEmpty()) {- replicasOfProject.iterator().next().setType(PRIMARY);- } else {- var replica = new ProjectReplica();- replica.setType(PRIMARY);- replica.setVersion(0);- replicasOfProject.add(replica);- entry.put(servers.iterator().next(), replica);- }- }- int backupCount = 0;- for (var replica : replicasOfProject) {- if (replica.getType() == BACKUP && ++backupCount > replicaCount - 1)- replica.setType(REDUNDANT);- }- if (backupCount < replicaCount - 1) {- for (var replica : replicasOfProject) {- if (replica.getType() == REDUNDANT) {- replica.setType(BACKUP);- backupCount++;- if (backupCount == replicaCount - 1)- break;- }- }- }- for (int i = 0; i < replicaCount - 1 - backupCount; i++) {- for (var server : servers) {- if (!entry.containsKey(server)) {- ProjectReplica replica = new ProjectReplica();- replica.setType(BACKUP);- replica.setVersion(0);- replicasOfProject.add(replica);- entry.put(server, replica);- break;- }- }- }- }-- // Now distribute all replicas across all servers evenly- Map<String, Integer> serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY, BACKUP));-- Map<String, Map<Long, ProjectReplica>> serverReplicas = new LinkedHashMap<>();- for (var projectToReplicas: replicas.entrySet()) {- var projectId = projectToReplicas.getKey();- for (var serverToReplica: projectToReplicas.getValue().entrySet()) {- var server = serverToReplica.getKey();- var replica = serverToReplica.getValue();- if (replica.getType() != REDUNDANT)- serverReplicas.computeIfAbsent(server, k -> new LinkedHashMap<>()).put(projectId, replica);- }- }- servers.forEach(it->serverReplicas.putIfAbsent(it, new LinkedHashMap<>()));-- while (true) {- String minLoadServer = null, maxLoadServer = null;- int minServerLoad = replicas.size() + 1, maxServerLoad = -1;- for (var entry : serverLoads.entrySet()) {- if (entry.getValue() > maxServerLoad) {- maxLoadServer = entry.getKey();- maxServerLoad = entry.getValue();- }- if (entry.getValue() < minServerLoad) {- minLoadServer = entry.getKey();- minServerLoad = entry.getValue();- }- }- if (maxServerLoad - minServerLoad >= 2) {- var replicasOnMaxLoadServer = serverReplicas.get(maxLoadServer);- var replicasOnMinLoadServer = serverReplicas.get(minLoadServer);- var moveLoad = (maxServerLoad - minServerLoad) / 2;- for (var i = 0; i < moveLoad; i++) {- for (var it = replicasOnMaxLoadServer.entrySet().iterator(); it.hasNext();) {- var entry = it.next();- var projectId = entry.getKey();- var replica = entry.getValue();- if (!replicasOnMinLoadServer.containsKey(projectId)) {- var replicasOfProject = replicas.get(projectId);- var prevReplica = replicasOfProject.get(minLoadServer);- if (prevReplica != null) {- prevReplica.setType(replica.getType());- replicasOnMinLoadServer.put(projectId, prevReplica);- } else {- var newReplica = new ProjectReplica();- newReplica.setType(replica.getType());- newReplica.setVersion(0);- replicasOfProject.put(minLoadServer, newReplica);- replicasOnMinLoadServer.put(projectId, newReplica);- }- replica.setType(REDUNDANT);- it.remove();- break;- }- }- }- serverLoads.put(maxLoadServer, maxServerLoad - moveLoad);- serverLoads.put(minLoadServer, minServerLoad + moveLoad);- } else {- break;- }- }-- // Now distribute primary replicas across servers evenly (best try)- serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY));-- for (var replicasOfProject: replicas.values()) {- var primaryServerLoad = -1;- Map.Entry<String, ProjectReplica> primaryEntry = null;- for (var serverToReplica: replicasOfProject.entrySet()) {- if (serverToReplica.getValue().getType() == PRIMARY) {- primaryEntry = serverToReplica;- primaryServerLoad = serverLoads.get(primaryEntry.getKey());- break;- }- }-- var minBackupServerLoad = replicas.size();- Map.Entry<String, ProjectReplica> minBackupEntry = null;- for (var serverToReplica: replicasOfProject.entrySet()) {- if (serverToReplica.getValue().getType() == BACKUP) {- var backupServer = serverToReplica.getKey();- var backupServerLoad = serverLoads.get(backupServer);- if (backupServerLoad < minBackupServerLoad) {- minBackupServerLoad = backupServerLoad;- minBackupEntry = serverToReplica;- }- }- }-- if (primaryServerLoad - minBackupServerLoad >= 2) {- primaryEntry.getValue().setType(BACKUP);- minBackupEntry.getValue().setType(PRIMARY);- serverLoads.put(primaryEntry.getKey(), primaryServerLoad - 1);- serverLoads.put(minBackupEntry.getKey(), minBackupServerLoad + 1);- }- }- }-- private static Map<String, Integer> getServerLoads(Map<Long, Map<String, ProjectReplica>> replicas,- Set<String> servers, Set<Type> replicaTypes) {- Map<String, Integer> serverLoads = new LinkedHashMap<>();- for (var replicasOfProject: replicas.values()) {- for (var entry: replicasOfProject.entrySet()) {- if (replicaTypes.contains(entry.getValue().getType())) {- Integer serverLoad = serverLoads.get(entry.getKey());- if (serverLoad == null)- serverLoad = 0;- serverLoads.put(entry.getKey(), ++serverLoad);- }- }- }- servers.forEach(it->serverLoads.putIfAbsent(it, 0));- return serverLoads;- }-- public static Map<String, ProjectReplica> addProject(Map<Long, Map<String, ProjectReplica>> replicas,- Set<String> servers, int replicaCount, Long projectId) {- for (var entry: replicas.values())- entry.entrySet().removeIf(it -> !servers.contains(it.getKey()));- var serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY, BACKUP));- var sortedServers = new ArrayList<>(servers);- sortedServers.sort(comparingInt(serverLoads::get));-- Map<String, ProjectReplica> replicasOfNewProject = new HashMap<>();- for (var server: sortedServers) {- var replica = new ProjectReplica();- replica.setType(BACKUP);- replica.setVersion(0);- replicasOfNewProject.put(server, replica);- if (replicasOfNewProject.size() >= replicaCount)- break;- }-- serverLoads = getServerLoads(replicas, servers, EnumSet.of(PRIMARY));- sortedServers = new ArrayList<>(replicasOfNewProject.keySet());- var primaryServer = sortedServers.stream().min(comparing(serverLoads::get)).get();- replicasOfNewProject.get(primaryServer).setType(PRIMARY);-- return replicasOfNewProject;- }--}diff --git a/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javanew file mode 100644index 0000000000..fa44b6256d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -0,0 +1,36 @@+package io.onedev.server.storage;++import io.onedev.commons.utils.FileUtils;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.model.Build;++import javax.inject.Inject;+import javax.inject.Singleton;+import java.io.File;++@Singleton+public class DefaultStorageManager implements StorageManager {++ private final ProjectManager projectManager;++ private final BuildManager buildManager;++ @Inject+ public DefaultStorageManager(ProjectManager projectManager, BuildManager buildManager) {+ this.projectManager = projectManager;+ this.buildManager = buildManager;+ }++ @Override+ public void initLfsDir(Long projectId) {+ FileUtils.createDir(new File(projectManager.getGitDir(projectId), "lfs"));+ }++ @Override+ public void initArtifactsDir(Long projectId, Long buildNumber) {+ File buildDir = buildManager.getStorageDir(projectId, buildNumber);+ FileUtils.createDir(new File(buildDir, Build.ARTIFACTS_DIR));+ }++}diff --git a/server-core/src/main/java/io/onedev/server/storage/StorageManager.java b/server-core/src/main/java/io/onedev/server/storage/StorageManager.javanew file mode 100644index 0000000000..fc85a985b7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/storage/StorageManager.java@@ -0,0 +1,13 @@+package io.onedev.server.storage;++import io.onedev.commons.utils.FileUtils;++import java.io.File;++public interface StorageManager {++ void initLfsDir(Long projectId);++ void initArtifactsDir(Long projectId, Long buildNumber);++}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.javaindex 3ae4f84ed4..080030bea6 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@@ -253,7 +253,7 @@ public abstract class ProjectInfoPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(latestVersion != -1);+ setVisible(latestVersion != -1 && OneDev.getInstance(ClusterManager.class).isClusteringSupported());}});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 88555cdc77..d81d0c0386 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.loader.Plugin;import io.onedev.server.OneDev;+import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;@@ -225,8 +226,10 @@ public abstract class LayoutPage extends BasePage {administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",GroovyScriptListPage.class, new PageParameters()));- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Clustering & Replication",- ClusterManagementPage.class, new PageParameters()));+ if (OneDev.getInstance(ClusterManager.class).isClusteringSupported()) {+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Clustering & Replication",+ ClusterManagementPage.class, new PageParameters()));+ }List<Class<? extends ContributedAdministrationSetting>> contributedSettingClasses = new ArrayList<>();for (AdministrationSettingContribution contribution:OneDev.getExtensions(AdministrationSettingContribution.class)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.javaindex 42aa4790b8..a1bd735e3a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java@@ -5,10 +5,10 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;import io.onedev.server.cluster.ClusterManager;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.FilenameUtils;import io.onedev.server.web.component.dropzonefield.DropzoneField;import io.onedev.server.web.util.FileUpload;@@ -105,8 +105,8 @@ public abstract class ArtifactUploadPanel extends Panel {if (activeServer.equals(clusterManager.getLocalServerAddress())) {LockUtils.write(getBuild().getArtifactsLockName(), () -> {File artifactsDir = getBuild().getArtifactsDir();- BuildManager buildManager = OneDev.getInstance(BuildManager.class);- buildManager.initArtifactsDir(getBuild().getProject().getId(), getBuild().getNumber());+ StorageManager storageManager = OneDev.getInstance(StorageManager.class);+ storageManager.initArtifactsDir(getBuild().getProject().getId(), getBuild().getNumber());for (FileUpload upload: uploads) {String filePath = getArtifactPath(upload);File file = new File(artifactsDir, filePath);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.javaindex 1cf3a3c551..d269e3409c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/BuildArtifactsPage.java@@ -94,8 +94,8 @@ public class BuildArtifactsPage extends BuildDetailPage {List<IColumn<ArtifactInfo, Void>> columns = new ArrayList<>();- columns.add(new TreeColumn<ArtifactInfo, Void>(Model.of("Name")));- columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("Size")) {+ columns.add(new TreeColumn<>(Model.of("Name")));+ columns.add(new AbstractColumn<>(Model.of("Size")) {@Overridepublic void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {@@ -104,35 +104,35 @@ public class BuildArtifactsPage extends BuildDetailPage {cellItem.add(new Label(componentId, ""));} else {cellItem.add(new Label(- componentId,+ componentId,FileUtils.byteCountToDisplaySize(((FileInfo) artifact).getLength())));}}-+});- columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("Last Modified")) {+ columns.add(new AbstractColumn<>(Model.of("Last Modified")) {@Overridepublic void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {ArtifactInfo artifact = rowModel.getObject();cellItem.add(new Label(componentId, DateUtils.formatAge(new Date(artifact.getLastModified()))));}-+});if (SecurityUtils.canManage(getBuild())) {- columns.add(new AbstractColumn<ArtifactInfo, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<ArtifactInfo>> cellItem, String componentId, IModel<ArtifactInfo> rowModel) {Fragment fragment = new Fragment(componentId, "deleteFrag", BuildArtifactsPage.this);- AjaxLink<?> link = new AjaxLink<Void>("link") {+ AjaxLink<?> link = new AjaxLink<Void>("link") {@Overridepublic void onClick(AjaxRequestTarget target) {getBuildManager().deleteArtifact(getBuild(), rowModel.getObject().getPath());updateArtifacts(target);}-+};if (rowModel.getObject() instanceof DirectoryInfo)link.add(new ConfirmClickModifier("Do you really want to delete this directory?"));@@ -141,7 +141,7 @@ public class BuildArtifactsPage extends BuildDetailPage {fragment.add(link);cellItem.add(fragment);}-+});}diff --git a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.javaindex b3f7afe4f4..f76c48dade 100644--- a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java@@ -53,14 +53,7 @@ public class DefaultGitServiceCommitTest extends AbstractGitTest {protected void setup() {super.setup();var projectManager = mock(ProjectManager.class);- when(projectManager.runOnActiveServer(any(), any())).thenAnswer(new Answer<Object>() {-- @Override- public Object answer(InvocationOnMock invocation) throws Throwable {- return invocation.getArgument(1, ClusterTask.class).call();- }-- });+ when(projectManager.runOnActiveServer(any(), any())).thenAnswer(invocation -> invocation.getArgument(1, ClusterTask.class).call());when(projectManager.getRepository(any())).thenReturn(git.getRepository());var settingManager = mock(SettingManager.class);diff --git a/server-core/src/test/java/io/onedev/server/replica/ReplicatUtilsTest.java b/server-core/src/test/java/io/onedev/server/replica/ReplicatUtilsTest.javadeleted file mode 100644index b12f152f8f..0000000000--- a/server-core/src/test/java/io/onedev/server/replica/ReplicatUtilsTest.java+++ /dev/null@@ -1,190 +0,0 @@-package io.onedev.server.replica;--import org.junit.Test;--import java.util.LinkedHashMap;-import java.util.LinkedHashSet;-import java.util.Map;-import java.util.Set;--import static io.onedev.server.replica.ProjectReplica.Type.*;-import static org.junit.Assert.assertEquals;--public class ReplicatUtilsTest {-- @Test- public void redistributeProjects() {- String server1 = "server1";- String server2 = "server2";-- Set<String> servers = new LinkedHashSet<>();- servers.add(server1);- servers.add(server2);-- Map<Long, Map<String, ProjectReplica>> replicas = new LinkedHashMap<>();-- Map<String, ProjectReplica> replicasOfProject = new LinkedHashMap<>();-- ProjectReplica replica = new ProjectReplica();- replica.setType(PRIMARY);- replica.setVersion(1);- replicasOfProject.put("server1", replica);-- replica = new ProjectReplica();- replica.setType(BACKUP);- replica.setVersion(1);- replicasOfProject.put("server2", replica);-- replicas.put(1L, replicasOfProject);-- replicasOfProject = new LinkedHashMap<>();-- replica = new ProjectReplica();- replica.setType(BACKUP);- replica.setVersion(1);- replicasOfProject.put("server1", replica);-- replica = new ProjectReplica();- replica.setType(PRIMARY);- replica.setVersion(1);- replicasOfProject.put("server2", replica);-- replicas.put(2L, replicasOfProject);-- ReplicaUtils.redistributeProjects(replicas, servers, 1);- assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());- assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());- assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());-- replicas = new LinkedHashMap<>();-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server1, replica);- replicas.put(1L, replicasOfProject);-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server1, replica);- replicas.put(2L, replicasOfProject);-- ReplicaUtils.redistributeProjects(replicas, servers, 1);- assertEquals(REDUNDANT, replicas.get(1L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(1L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server1).getType());-- ReplicaUtils.redistributeProjects(replicas, servers, 2);- assertEquals(BACKUP, replicas.get(1L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(1L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server1).getType());- assertEquals(BACKUP, replicas.get(2L).get(server2).getType());-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server1, replica);- replicas.put(3L, replicasOfProject);-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server2, replica);- replicas.put(4L, replicasOfProject);-- String server3 = "server3";- servers.add(server3);- ReplicaUtils.redistributeProjects(replicas, servers, 2);- assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());- assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());- assertEquals(BACKUP, replicas.get(1L).get(server3).getType());- assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());- assertEquals(BACKUP, replicas.get(2L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(3L).get(server1).getType());- assertEquals(BACKUP, replicas.get(3L).get(server2).getType());- assertEquals(BACKUP, replicas.get(4L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(4L).get(server2).getType());-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server1, replica);- replicas.put(5L, replicasOfProject);-- replica = new ProjectReplica();- replica.setVersion(1);- replica.setType(PRIMARY);- replicasOfProject = new LinkedHashMap<>();- replicasOfProject.put(server1, replica);- replicas.put(6L, replicasOfProject);- ReplicaUtils.redistributeProjects(replicas, servers, 2);- assertEquals(PRIMARY, replicas.get(1L).get(server1).getType());- assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());- assertEquals(BACKUP, replicas.get(1L).get(server3).getType());- assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());- assertEquals(BACKUP, replicas.get(2L).get(server3).getType());- assertEquals(REDUNDANT, replicas.get(3L).get(server1).getType());- assertEquals(BACKUP, replicas.get(3L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());- assertEquals(BACKUP, replicas.get(4L).get(server1).getType());- assertEquals(REDUNDANT, replicas.get(4L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(4L).get(server3).getType());- assertEquals(BACKUP, replicas.get(5L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(5L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(6L).get(server1).getType());- assertEquals(BACKUP, replicas.get(6L).get(server2).getType());-- String server4 = "server4";- servers.add(server4);-- ReplicaUtils.redistributeProjects(replicas, servers, 3);- assertEquals(BACKUP, replicas.get(1L).get(server1).getType());- assertEquals(REDUNDANT, replicas.get(1L).get(server2).getType());- assertEquals(BACKUP, replicas.get(1L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(1L).get(server4).getType());- assertEquals(REDUNDANT, replicas.get(2L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server2).getType());- assertEquals(BACKUP, replicas.get(2L).get(server3).getType());- assertEquals(BACKUP, replicas.get(2L).get(server4).getType());- assertEquals(REDUNDANT, replicas.get(3L).get(server1).getType());- assertEquals(BACKUP, replicas.get(3L).get(server2).getType());- assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());- assertEquals(BACKUP, replicas.get(3L).get(server4).getType());- assertEquals(BACKUP, replicas.get(4L).get(server1).getType());- assertEquals(BACKUP, replicas.get(4L).get(server2).getType());- assertEquals(REDUNDANT, replicas.get(4L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(4L).get(server4).getType());- assertEquals(BACKUP, replicas.get(5L).get(server1).getType());- assertEquals(PRIMARY, replicas.get(5L).get(server2).getType());- assertEquals(BACKUP, replicas.get(5L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(6L).get(server1).getType());- assertEquals(BACKUP, replicas.get(6L).get(server2).getType());- assertEquals(BACKUP, replicas.get(6L).get(server3).getType());-- servers.remove(server1);- servers.remove(server2);- ReplicaUtils.redistributeProjects(replicas, servers, 3);- assertEquals(BACKUP, replicas.get(1L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(1L).get(server4).getType());- assertEquals(BACKUP, replicas.get(2L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(2L).get(server4).getType());- assertEquals(PRIMARY, replicas.get(3L).get(server3).getType());- assertEquals(BACKUP, replicas.get(3L).get(server4).getType());- assertEquals(BACKUP, replicas.get(4L).get(server3).getType());- assertEquals(PRIMARY, replicas.get(4L).get(server4).getType());- assertEquals(PRIMARY, replicas.get(5L).get(server3).getType());- assertEquals(BACKUP, replicas.get(5L).get(server4).getType());- assertEquals(PRIMARY, replicas.get(6L).get(server3).getType());- assertEquals(BACKUP, replicas.get(6L).get(server4).getType());- }--}\ No newline at end of filediff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex c8377e2c36..25334b0aeb 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 2d16dfd331..1319fb5831 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex c03138e3e6..ef0963ae16 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex bfd8606642..e8ee0d6e8d 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 57d258680d..661229d0fc 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex c6387ca7d9..cfdd2f27d1 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex baa8db4714..804f6aa5dc 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 1c9f22cb9e..f39bc29f11 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 582da54200..8b16bf5f41 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 0f4868b2f8..2f8ce40033 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex c707ccc5e7..de57647244 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex eae34323e2..995dd11812 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 67d5078b5d..ba55e4cfb3 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex b3cf76acd9..254d6b8781 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 888c8d8374..33d2ef99da 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex a1e34c6747..2ed615b852 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xmlindex 51e28f55f2..0462aab753 100644--- a/server-plugin/server-plugin-import-url/pom.xml+++ b/server-plugin/server-plugin-import-url/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex c10e021b34..f61a3d8732 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xmlindex d6a1d3f77e..7b8efdba2f 100644--- a/server-plugin/server-plugin-notification-discord/pom.xml+++ b/server-plugin/server-plugin-notification-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xmlindex 790cc5ac09..41b5637d91 100644--- a/server-plugin/server-plugin-notification-slack/pom.xml+++ b/server-plugin/server-plugin-notification-slack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex a0d06e4c45..3769ab9b65 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex a764fda766..2d800ae32e 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 7deb7df5b5..4a32a1209b 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.javaindex 7818db22b6..7a24eef1f6 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java@@ -31,9 +31,9 @@ import java.util.*;import java.util.stream.Collectors;import static io.onedev.commons.utils.LockUtils.read;-import static io.onedev.server.model.Build.getProjectRelativePath;+import static io.onedev.server.model.Build.getProjectRelativeStoragePath;import static io.onedev.server.model.Build.getStorageDir;-import static io.onedev.server.plugin.report.coverage.CoverageReport.DIR_CATEGORY;+import static io.onedev.server.plugin.report.coverage.CoverageReport.CATEGORY;import static io.onedev.server.plugin.report.coverage.CoverageReport.getReportLockName;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;@@ -108,7 +108,7 @@ public class CoverageModule extends AbstractPluginModule {contribute(BuildStorageSyncer.class, ((projectId, buildNumber, activeServer) -> {getProjectManager().syncDirectory(projectId,- getProjectRelativePath(buildNumber) + "/" + DIR_CATEGORY,+ getProjectRelativeStoragePath(buildNumber) + "/" + CATEGORY,getReportLockName(projectId, buildNumber), activeServer);}));@@ -135,7 +135,7 @@ public class CoverageModule extends AbstractPluginModule {public List<BuildTab> call() {return read(getReportLockName(projectId, buildNumber), () -> {List<BuildTab> tabs = new ArrayList<>();- File categoryDir = new File(getStorageDir(projectId, buildNumber), DIR_CATEGORY);+ File categoryDir = new File(getStorageDir(projectId, buildNumber), CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!reportDir.isHidden() && !isVersionFile(reportDir)) {@@ -174,11 +174,11 @@ public class CoverageModule extends AbstractPluginModule {public Map<String, Map<Integer, CoverageStatus>> call() {return read(getReportLockName(projectId, buildNumber), () -> {Map<String, Map<Integer, CoverageStatus>> coverages = new HashMap<>();- File categoryDir = new File(getStorageDir(projectId, buildNumber), DIR_CATEGORY);+ File categoryDir = new File(getStorageDir(projectId, buildNumber), CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (reportName == null || reportName.equals(reportDir.getName())) {- File lineCoveragesFile = new File(reportDir, CoverageReport.DIR_FILES + "/" + blobPath);+ File lineCoveragesFile = new File(reportDir, CoverageReport.FILES + "/" + blobPath);if (lineCoveragesFile.exists()) {try (InputStream is = new BufferedInputStream(new FileInputStream(lineCoveragesFile))) {coverages.put(reportDir.getName(), (Map<Integer, CoverageStatus>) SerializationUtils.deserialize(is));diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReport.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReport.javaindex ced8d86c9f..2700d5aa38 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReport.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReport.java@@ -19,11 +19,11 @@ public class CoverageReport implements Serializable {private static final long serialVersionUID = 1L;- public static final String DIR_CATEGORY = "coverage";+ public static final String CATEGORY = "coverage";- public static final String DIR_FILES = "files";+ public static final String FILES = "files";- private static final String FILE_REPORT = "report.ser";+ private static final String REPORT = "report.ser";private final CoverageInfo coverages;@@ -43,7 +43,7 @@ public class CoverageReport implements Serializable {}public static CoverageReport readFrom(File reportDir) {- File reportFile = new File(reportDir, FILE_REPORT);+ File reportFile = new File(reportDir, REPORT);try (InputStream is = new BufferedInputStream(new FileInputStream(reportFile))) {return (CoverageReport) SerializationUtils.deserialize(is);} catch (IOException e) {@@ -52,7 +52,7 @@ public class CoverageReport implements Serializable {}public void writeTo(File reportDir) {- File reportFile = new File(reportDir, FILE_REPORT);+ File reportFile = new File(reportDir, REPORT);try (OutputStream os = new BufferedOutputStream(new FileOutputStream(reportFile))) {SerializationUtils.serialize(this, os);} catch (IOException e) {diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.javaindex 97955b9796..69901ff95f 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportPage.java@@ -431,7 +431,7 @@ public class CoverageReportPage extends BuildReportPage {@Overridepublic CoverageReport call() throws Exception {- return CoverageReport.readFrom(new File(Build.getStorageDir(projectId, buildNumber), CoverageReport.DIR_CATEGORY + "/" + reportName));+ return CoverageReport.readFrom(new File(Build.getStorageDir(projectId, buildNumber), CoverageReport.CATEGORY + "/" + reportName));}});diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.javaindex 1f9d8af25f..f2a774d110 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/PublishCoverageReportStep.java@@ -34,7 +34,7 @@ public abstract class PublishCoverageReportStep extends PublishReportStep {@Overridepublic Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {CoverageReport report = write(getReportLockName(build), () -> {- File reportDir = new File(build.getStorageDir(), CoverageReport.DIR_CATEGORY + "/" + getReportName());+ File reportDir = new File(build.getStorageDir(), CoverageReport.CATEGORY + "/" + getReportName());FileUtils.createDir(reportDir);try {@@ -79,8 +79,8 @@ public abstract class PublishCoverageReportStep extends PublishReportStep {protected abstract CoverageReport createReport(Build build, File inputDir, File reportDir, TaskLogger logger);protected void writeLineCoverages(Build build, String blobPath, Map<Integer, CoverageStatus> lineCoverages) {- File reportDir = new File(build.getStorageDir(), CoverageReport.DIR_CATEGORY + "/" + getReportName());- File lineCoverageFile = new File(reportDir, CoverageReport.DIR_FILES + "/" + blobPath);+ File reportDir = new File(build.getStorageDir(), CoverageReport.CATEGORY + "/" + getReportName());+ File lineCoverageFile = new File(reportDir, CoverageReport.FILES + "/" + blobPath);FileUtils.createDir(lineCoverageFile.getParentFile());try (OutputStream os = new FileOutputStream(lineCoverageFile)) {SerializationUtils.serialize((Serializable) lineCoverages, os);diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex c24943a868..2ce1441940 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex d90e7e89c3..324f9b282c 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 4456ea4ce0..0945feb7ce 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 4b0cc18a4d..d33a551b44 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 085d42ca03..fbdb47248b 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.javaindex 4d3d734be4..4017f8280c 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java@@ -26,7 +26,7 @@ import java.util.List;import java.util.stream.Collectors;import static io.onedev.commons.utils.LockUtils.read;-import static io.onedev.server.model.Build.getProjectRelativePath;+import static io.onedev.server.model.Build.getProjectRelativeStoragePath;import static io.onedev.server.model.Build.getStorageDir;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;@@ -102,10 +102,10 @@ public class MarkdownModule extends AbstractPluginModule {contribute(BuildStorageSyncer.class, ((projectId, buildNumber, activeServer) -> {getProjectManager().syncDirectory(projectId,- getProjectRelativePath(buildNumber) + "/" + PublishMarkdownReportStep.DIR_CATEGORY,+ getProjectRelativeStoragePath(buildNumber) + "/" + PublishMarkdownReportStep.CATEGORY,PublishMarkdownReportStep.getReportLockName(projectId, buildNumber), activeServer);getProjectManager().syncDirectory(projectId,- getProjectRelativePath(buildNumber) + "/" + PublishPullRequestMarkdownReportStep.DIR_CATEGORY,+ getProjectRelativeStoragePath(buildNumber) + "/" + PublishPullRequestMarkdownReportStep.CATEGORY,PublishPullRequestMarkdownReportStep.getReportLockName(projectId, buildNumber), activeServer);}));@@ -132,7 +132,7 @@ public class MarkdownModule extends AbstractPluginModule {public List<BuildTab> call() {return read(PublishMarkdownReportStep.getReportLockName(projectId, buildNumber), () -> {List<BuildTab> tabs = new ArrayList<>();- File categoryDir = new File(getStorageDir(projectId, buildNumber), PublishMarkdownReportStep.DIR_CATEGORY);+ File categoryDir = new File(getStorageDir(projectId, buildNumber), PublishMarkdownReportStep.CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!isVersionFile(reportDir))@@ -163,7 +163,7 @@ public class MarkdownModule extends AbstractPluginModule {public List<PullRequestSummaryPart> call() {return read(PublishPullRequestMarkdownReportStep.getReportLockName(projectId, buildNumber), () -> {List<PullRequestSummaryPart> parts = new ArrayList<>();- File categoryDir = new File(getStorageDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.DIR_CATEGORY);+ File categoryDir = new File(getStorageDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!isVersionFile(reportDir))diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.javaindex 6d45692101..b148f17939 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportDownloadResource.java@@ -71,7 +71,7 @@ public class MarkdownReportDownloadResource extends AbstractResource {String markdownPath = Joiner.on("/").join(pathSegments);File buildDir = build.getStorageDir();- File reportDir = new File(buildDir, PublishMarkdownReportStep.DIR_CATEGORY + "/" + reportName);+ File reportDir = new File(buildDir, PublishMarkdownReportStep.CATEGORY + "/" + reportName);File markdownFile = new File(reportDir, markdownPath);if (!markdownFile.exists() || markdownFile.isDirectory()) {diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.javaindex 4bfb55a32a..a74ab63d20 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportPage.java@@ -113,7 +113,7 @@ public class MarkdownReportPage extends BuildDetailPage {@Overridepublic String call() throws Exception {File file = new File(Build.getStorageDir(projectId, buildNumber),- PublishMarkdownReportStep.DIR_CATEGORY + "/" + reportName + "/" + filePath);+ PublishMarkdownReportStep.CATEGORY + "/" + reportName + "/" + filePath);return FileUtils.readFileToString(file, StandardCharsets.UTF_8);}diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.javaindex a32918b552..c74edfa40e 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownReportTab.java@@ -78,7 +78,7 @@ public class MarkdownReportTab extends BuildTab {@Overridepublic String call() throws Exception {File startPageFile = new File(Build.getStorageDir(projectId, buildNumber),- PublishMarkdownReportStep.DIR_CATEGORY + "/" + reportName + "/" + PublishMarkdownReportStep.FILE_START_PAGE);+ PublishMarkdownReportStep.CATEGORY + "/" + reportName + "/" + PublishMarkdownReportStep.START_PAGE);return FileUtils.readFileToString(startPageFile, StandardCharsets.UTF_8);}diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.javaindex 4cbf16a08d..6a4949e9a8 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java@@ -26,9 +26,9 @@ public class PublishMarkdownReportStep extends PublishReportStep {private static final long serialVersionUID = 1L;- public static final String DIR_CATEGORY = "markdown";+ public static final String CATEGORY = "markdown";- public static final String FILE_START_PAGE = "$onedev-startpage$";+ public static final String START_PAGE = "$onedev-startpage$";private String startPage;@@ -61,10 +61,10 @@ public class PublishMarkdownReportStep extends PublishReportStep {write(getReportLockName(build), () -> {File startPage = new File(inputDir, getStartPage());if (startPage.exists()) {- File reportDir = new File(build.getStorageDir(), DIR_CATEGORY + "/" + getReportName());+ File reportDir = new File(build.getStorageDir(), CATEGORY + "/" + getReportName());FileUtils.createDir(reportDir);- File startPageFile = new File(reportDir, FILE_START_PAGE);+ File startPageFile = new File(reportDir, START_PAGE);FileUtils.writeFile(startPageFile, getStartPage());int baseLen = inputDir.getAbsolutePath().length() + 1;diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.javaindex 4acb16fe5f..fa7d6b1c98 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java@@ -27,9 +27,9 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {private static final long serialVersionUID = 1L;- public static final String DIR_CATEGORY = "pull-request-markdown";+ public static final String CATEGORY = "pull-request-markdown";- public static final String FILE_CONTENT = "content.md";+ public static final String CONTENT = "content.md";private String file;@@ -60,10 +60,10 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {write(getReportLockName(build.getProject().getId(), build.getNumber()), () -> {File file = new File(workspace, getFile());if (file.exists()) {- File reportDir = new File(build.getStorageDir(), DIR_CATEGORY + "/" + getReportName());+ File reportDir = new File(build.getStorageDir(), CATEGORY + "/" + getReportName());String markdown = FileUtils.readFileToString(file, StandardCharsets.UTF_8);FileUtils.createDir(reportDir);- FileUtils.writeFile(new File(reportDir, FILE_CONTENT), markdown, StandardCharsets.UTF_8.name());+ FileUtils.writeFile(new File(reportDir, CONTENT), markdown, StandardCharsets.UTF_8.name());OneDev.getInstance(ProjectManager.class).directoryModified(build.getProject().getId(), reportDir.getParentFile());} else {diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PullRequestSummaryMarkdownPart.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PullRequestSummaryMarkdownPart.javaindex bfc0f3d075..0e201f2308 100644--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PullRequestSummaryMarkdownPart.java+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PullRequestSummaryMarkdownPart.java@@ -38,8 +38,8 @@ public class PullRequestSummaryMarkdownPart extends PullRequestSummaryPart {@Overridepublic String call() throws Exception {- File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.DIR_CATEGORY);- File file = new File(new File(categoryDir, getReportName()), PublishPullRequestMarkdownReportStep.FILE_CONTENT);+ File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), PublishPullRequestMarkdownReportStep.CATEGORY);+ File file = new File(new File(categoryDir, getReportName()), PublishPullRequestMarkdownReportStep.CONTENT);return FileUtils.readFileToString(file, StandardCharsets.UTF_8);}diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 166b367657..396945b83b 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex a88db03cce..7260221914 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.javaindex 5d617f0246..4c71638365 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java@@ -31,8 +31,8 @@ import java.util.*;import java.util.stream.Collectors;import static io.onedev.commons.utils.LockUtils.read;-import static io.onedev.server.model.Build.getProjectRelativePath;-import static io.onedev.server.plugin.report.problem.ProblemReport.DIR_CATEGORY;+import static io.onedev.server.model.Build.getProjectRelativeStoragePath;+import static io.onedev.server.plugin.report.problem.ProblemReport.CATEGORY;import static io.onedev.server.plugin.report.problem.ProblemReport.getReportLockName;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;@@ -109,7 +109,7 @@ public class ProblemModule extends AbstractPluginModule {contribute(BuildStorageSyncer.class, ((projectId, buildNumber, activeServer) -> {OneDev.getInstance(ProjectManager.class).syncDirectory(projectId,- getProjectRelativePath(buildNumber) + "/" + DIR_CATEGORY,+ getProjectRelativeStoragePath(buildNumber) + "/" + CATEGORY,getReportLockName(projectId, buildNumber), activeServer);}));}@@ -141,11 +141,11 @@ public class ProblemModule extends AbstractPluginModule {public Map<String, List<CodeProblem>> call() {return read(getReportLockName(projectId, buildNumber), () -> {Map<String, List<CodeProblem>> problems = new HashMap<>();- File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), DIR_CATEGORY);+ File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!isVersionFile(reportDir) && (reportName == null || reportName.equals(reportDir.getName()))) {- File file = new File(reportDir, ProblemReport.DIR_FILES + "/" + blobPath);+ File file = new File(reportDir, ProblemReport.FILES + "/" + blobPath);if (file.exists()) {try (InputStream is = new BufferedInputStream(new FileInputStream(file))) {problems.put(reportDir.getName(), (List<CodeProblem>) SerializationUtils.deserialize(is));@@ -177,7 +177,7 @@ public class ProblemModule extends AbstractPluginModule {public List<BuildTab> call() {return read(getReportLockName(projectId, buildNumber), () -> {List<BuildTab> tabs = new ArrayList<>();- File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), DIR_CATEGORY);+ File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!reportDir.isHidden() && !isVersionFile(reportDir)) {diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.javaindex f6b74ec0ca..ba5787ccc0 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReport.java@@ -24,11 +24,11 @@ public class ProblemReport implements Serializable {private static final long serialVersionUID = 1L;- public static final String DIR_CATEGORY = "problem";+ public static final String CATEGORY = "problem";- private static final String FILE_REPORT = "report.ser";+ private static final String REPORT = "report.ser";- public static final String DIR_FILES = "files";+ public static final String FILES = "files";private final List<CodeProblem> problems;@@ -69,7 +69,7 @@ public class ProblemReport implements Serializable {}public static ProblemReport readFrom(File reportDir) {- File dataFile = new File(reportDir, FILE_REPORT);+ File dataFile = new File(reportDir, REPORT);try (InputStream is = new BufferedInputStream(new FileInputStream(dataFile))) {return (ProblemReport) SerializationUtils.deserialize(is);} catch (IOException e) {@@ -78,7 +78,7 @@ public class ProblemReport implements Serializable {}public void writeTo(File reportDir) {- File dataFile = new File(reportDir, FILE_REPORT);+ File dataFile = new File(reportDir, REPORT);try (OutputStream os = new BufferedOutputStream(new FileOutputStream(dataFile))) {SerializationUtils.serialize(this, os);} catch (IOException e) {diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.javaindex aec8a58f4d..067442a36f 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java@@ -394,7 +394,7 @@ public class ProblemReportPage extends BuildReportPage {@Overridepublic ProblemReport call() throws Exception {- File reportDir = new File(Build.getStorageDir(projectId, buildNumber), ProblemReport.DIR_CATEGORY + "/" + reportName);+ File reportDir = new File(Build.getStorageDir(projectId, buildNumber), ProblemReport.CATEGORY + "/" + reportName);return ProblemReport.readFrom(reportDir);}diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.javaindex afd6aeb98c..3a2c430ccc 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/PublishProblemReportStep.java@@ -31,7 +31,7 @@ public abstract class PublishProblemReportStep extends PublishReportStep {@Overridepublic Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- File reportDir = new File(build.getStorageDir(), ProblemReport.DIR_CATEGORY + "/" + getReportName());+ File reportDir = new File(build.getStorageDir(), ProblemReport.CATEGORY + "/" + getReportName());ProblemReport report = LockUtils.write(ProblemReport.getReportLockName(build), () -> {FileUtils.createDir(reportDir);@@ -76,8 +76,8 @@ public abstract class PublishProblemReportStep extends PublishReportStep {}protected void writeFileProblems(Build build, String blobPath, List<CodeProblem> problemsOfFile) {- File reportDir = new File(build.getStorageDir(), ProblemReport.DIR_CATEGORY + "/" + getReportName());- File violationsFile = new File(reportDir, ProblemReport.DIR_FILES + "/" + blobPath);+ File reportDir = new File(build.getStorageDir(), ProblemReport.CATEGORY + "/" + getReportName());+ File violationsFile = new File(reportDir, ProblemReport.FILES + "/" + blobPath);FileUtils.createDir(violationsFile.getParentFile());try (OutputStream os = new FileOutputStream(violationsFile)) {SerializationUtils.serialize((Serializable) problemsOfFile, os);diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex e6e5bcc2c7..60c48932ca 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 087fcb0bde..3ea0663ed2 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.javaindex e04b6e7316..6331037fb0 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/PublishUnitTestReportStep.java@@ -25,7 +25,7 @@ public abstract class PublishUnitTestReportStep extends PublishReportStep {@Overridepublic Map<String, byte[]> run(Build build, File inputDir, TaskLogger logger) {- File reportDir = new File(build.getStorageDir(), UnitTestReport.DIR_CATEGORY + "/" + getReportName());+ File reportDir = new File(build.getStorageDir(), UnitTestReport.CATEGORY + "/" + getReportName());UnitTestReport report = write(getReportLockName(build), () -> {UnitTestReport aReport = createReport(build, inputDir, logger);diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.javaindex a629bec1b5..c5644357b8 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java@@ -26,8 +26,8 @@ import java.util.List;import java.util.stream.Collectors;import static io.onedev.commons.utils.LockUtils.read;-import static io.onedev.server.model.Build.getProjectRelativePath;-import static io.onedev.server.plugin.report.unittest.UnitTestReport.DIR_CATEGORY;+import static io.onedev.server.model.Build.getProjectRelativeStoragePath;+import static io.onedev.server.plugin.report.unittest.UnitTestReport.CATEGORY;import static io.onedev.server.plugin.report.unittest.UnitTestReport.getReportLockName;import static io.onedev.server.util.DirectoryVersionUtils.isVersionFile;@@ -87,7 +87,7 @@ public class UnitTestModule extends AbstractPluginModule {contribute(BuildStorageSyncer.class, ((projectId, buildNumber, activeServer) -> {getProjectManager().syncDirectory(projectId,- getProjectRelativePath(buildNumber) + "/" + DIR_CATEGORY,+ getProjectRelativeStoragePath(buildNumber) + "/" + CATEGORY,getReportLockName(projectId, buildNumber), activeServer);}));}@@ -113,7 +113,7 @@ public class UnitTestModule extends AbstractPluginModule {public List<BuildTab> call() {return read(getReportLockName(projectId, buildNumber), () -> {List<BuildTab> tabs = new ArrayList<>();- File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), DIR_CATEGORY);+ File categoryDir = new File(Build.getStorageDir(projectId, buildNumber), CATEGORY);if (categoryDir.exists()) {for (File reportDir: categoryDir.listFiles()) {if (!reportDir.isHidden() && !isVersionFile(reportDir)) {diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.javaindex adfc0b98d9..6a330481de 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReport.java@@ -28,9 +28,9 @@ public class UnitTestReport implements Serializable {private static final long serialVersionUID = 1L;- public static final String DIR_CATEGORY = "unit-test";+ public static final String CATEGORY = "unit-test";- private static final String FILE_REPORT = "report.ser";+ private static final String REPORT = "report.ser";public static enum Status {@@ -94,7 +94,7 @@ public class UnitTestReport implements Serializable {@Nullablepublic static UnitTestReport readFrom(File reportDir) {- File reportFile = new File(reportDir, FILE_REPORT);+ File reportFile = new File(reportDir, REPORT);try (InputStream is = new BufferedInputStream(new FileInputStream(reportFile))) {return (UnitTestReport) SerializationUtils.deserialize(is);} catch (IOException e) {@@ -103,7 +103,7 @@ public class UnitTestReport implements Serializable {}public void writeTo(File reportDir) {- File reportFile = new File(reportDir, FILE_REPORT);+ File reportFile = new File(reportDir, REPORT);try (OutputStream os = new BufferedOutputStream(new FileOutputStream(reportFile))) {SerializationUtils.serialize(this, os);} catch (IOException e) {diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.javaindex 002bacf310..bc9bcea654 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportPage.java@@ -128,7 +128,7 @@ public abstract class UnitTestReportPage extends BuildReportPage {@Overridepublic UnitTestReport call() throws Exception {- File reportDir = new File(Build.getStorageDir(projectId, buildNumber), UnitTestReport.DIR_CATEGORY + "/" + reportName);+ File reportDir = new File(Build.getStorageDir(projectId, buildNumber), UnitTestReport.CATEGORY + "/" + reportName);return UnitTestReport.readFrom(reportDir);}diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 0809f98cec..a00758c568 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 9c75f6aedb..324e0b48c9 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 9e01ccbb04..9e957365f7 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>8.0.16</version>+ <version>8.1.0</version></parent><dependencies><dependency>@@ -160,6 +160,7 @@<artifactId>server-plugin-notification-discord</artifactId><version>${project.version}</version></dependency>+<!-- Add explicit dependencies to make sure standalone plugins use expected lib version --><dependency><groupId>commons-codec</groupId>