The Unified and Autonomous Development Platform
feat: Performance improvements for massive number of projects (more than 20k) (OD-2485)
Robin Sheneeef3f8f9460
diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.javaindex 0a427c8338..be979d09f1 100644--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java@@ -82,6 +82,9 @@ import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.IOUtils;import io.onedev.server.util.artifact.FileInfo;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;@Singletonpublic class DefaultAttachmentManager implements AttachmentManager, SchedulableTask, Serializable {@@ -89,6 +92,8 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate static final Logger logger = LoggerFactory.getLogger(DefaultAttachmentManager.class);private static final long TEMP_PRESERVE_PERIOD = 24*3600*1000L;++ private static final int HOUSE_KEEPING_PRIORITY = 50;private static final String PERMANENT = "permanent";@@ -107,6 +112,8 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate final SettingManager settingManager;private final IssueManager issueManager;++ private final BatchWorkManager batchWorkManager;private String taskId;@@ -114,7 +121,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTpublic DefaultAttachmentManager(Dao dao, TransactionManager transactionManager,TaskScheduler taskScheduler, SettingManager settingManager,ProjectManager projectManager, ClusterManager clusterManager,- IssueManager issueManager) {+ IssueManager issueManager, BatchWorkManager batchWorkManager) {this.dao = dao;this.transactionManager = transactionManager;this.taskScheduler = taskScheduler;@@ -122,6 +129,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTthis.projectManager = projectManager;this.clusterManager = clusterManager;this.issueManager = issueManager;+ this.batchWorkManager = batchWorkManager;}public Object writeReplace() throws ObjectStreamException {@@ -356,23 +364,29 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTtaskScheduler.unschedule(taskId);}- @Sessional@Overridepublic void execute() {- for (var projectId: projectManager.getActiveIds()) {- try {- File tempAttachmentBase = new File(projectManager.getAttachmentDir(projectId), TEMP);- if (tempAttachmentBase.exists()) {- for (File attachmentGroupDir: tempAttachmentBase.listFiles()) {- if (System.currentTimeMillis() - attachmentGroupDir.lastModified() > TEMP_PRESERVE_PERIOD) {- FileUtils.deleteDir(attachmentGroupDir);+ batchWorkManager.submit(new BatchWorker("attachment-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ for (var projectId: projectManager.getActiveIds()) {+ try {+ File tempAttachmentBase = new File(projectManager.getAttachmentDir(projectId), TEMP);+ if (tempAttachmentBase.exists()) {+ for (File attachmentGroupDir: tempAttachmentBase.listFiles()) {+ if (System.currentTimeMillis() - attachmentGroupDir.lastModified() > TEMP_PRESERVE_PERIOD) {+ FileUtils.deleteDir(attachmentGroupDir);+ }+ }}+ } catch (Exception e) {+ logger.error("Error cleaning up temp attachments", e);}}- } catch (Exception e) {- logger.error("Error cleaning up temp attachments", e);}- }++ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}@Overridediff --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 bb0cf6b232..d625c1eff0 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@@ -297,7 +297,7 @@ public class ClusterResource {try {File gitDir = projectManager.getGitDir(projectId);if (upload) {- workExecutor.submit(GitFilter.PRIORITY, new Runnable() {+ workExecutor.submit(GitFilter.PACK_PRIORITY, new Runnable() {@Overridepublic void run() {@@ -306,7 +306,7 @@ public class ClusterResource {}).get();} else {- workExecutor.submit(GitFilter.PRIORITY, new Runnable() {+ workExecutor.submit(GitFilter.PACK_PRIORITY, new Runnable() {@Overridepublic void run() {diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex 6480aaef62..c631fecad9 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -934,7 +934,7 @@ public class DefaultDataManager implements DataManager, Serializable {} finally {FileUtils.deleteDir(tempDir);}- }+ }}@Overridediff --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 47d25cbe22..ff5cf83978 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@@ -117,6 +117,9 @@ import io.onedev.server.util.StatusInfo;import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.BuildFacade;import io.onedev.server.web.util.StatsGroup;@@ -127,6 +130,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate static final int STATUS_QUERY_BATCH = 500;private static final int CLEANUP_BATCH = 5000;++ private static final int HOUSE_KEEPING_PRIORITY = 50;private static final Logger logger = LoggerFactory.getLogger(DefaultBuildManager.class);@@ -151,6 +156,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate final Set<BuildStorageSyncer> storageSyncers;private final SequenceGenerator numberGenerator;++ private final BatchWorkManager batchWorkManager;private volatile IMap<Long, BuildFacade> cache;@@ -164,7 +171,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiProjectManager projectManager, SessionManager sessionManager,TransactionManager transactionManager, BuildLabelManager labelManager,ClusterManager clusterManager, StorageManager storageManager,- Set<BuildStorageSyncer> storageSyncers) {+ BatchWorkManager batchWorkManager, Set<BuildStorageSyncer> storageSyncers) {super(dao);this.buildParamManager = buildParamManager;this.buildDependenceManager = buildDependenceManager;@@ -175,6 +182,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buithis.labelManager = labelManager;this.clusterManager = clusterManager;this.storageManager = storageManager;+ this.batchWorkManager = batchWorkManager;this.storageSyncers = storageSyncers;numberGenerator = new SequenceGenerator(Build.class, clusterManager, dao);@@ -749,61 +757,68 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Overridepublic void execute() {- if (clusterManager.isLeaderServer()) {- long maxId = getMaxId();- Collection<Long> idsToPreserve = new HashSet<>();-- sessionManager.run(() -> {- for (Project project: projectManager.query()) {- logger.debug("Populating preserved build ids of project '" + project.getPath() + "'...");- List<BuildPreservation> preservations = project.getHierarchyBuildPreservations();- if (preservations.isEmpty()) {- idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));- } else {- for (BuildPreservation preservation: preservations) {- try {- BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);- int count;- if (preservation.getCount() != null)- count = preservation.getCount();- else- count = Integer.MAX_VALUE;- idsToPreserve.addAll(queryIds(project, query, 0, count));- } catch (Exception e) {- String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",- project.getPath(), preservation.getCondition());- logger.error(message, e);+ batchWorkManager.submit(new BatchWorker("build-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ if (clusterManager.isLeaderServer()) {+ long maxId = getMaxId();+ Collection<Long> idsToPreserve = new HashSet<>();++ sessionManager.run(() -> {+ for (Project project: projectManager.query()) {+ logger.debug("Populating preserved build ids of project '" + project.getPath() + "'...");+ List<BuildPreservation> preservations = project.getHierarchyBuildPreservations();+ if (preservations.isEmpty()) {idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ } else {+ for (BuildPreservation preservation: preservations) {+ try {+ BuildQuery query = BuildQuery.parse(project, preservation.getCondition(), false, false);+ int count;+ if (preservation.getCount() != null)+ count = preservation.getCount();+ else+ count = Integer.MAX_VALUE;+ idsToPreserve.addAll(queryIds(project, query, 0, count));+ } catch (Exception e) {+ String message = String.format("Error parsing build preserve condition(project: %s, condition: %s)",+ project.getPath(), preservation.getCondition());+ logger.error(message, e);+ idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));+ }+ }}}- }- }- });+ });++ EntityCriteria<Build> criteria = newCriteria();+ AtomicInteger firstResult = new AtomicInteger(0);++ while (transactionManager.call(() -> {+ List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);+ if (!builds.isEmpty()) {+ logger.debug("Checking build preservation: {}->{}",+ firstResult.get()+1, firstResult.get()+builds.size());+ }+ for (Build build: builds) {+ if (build.isFinished() && build.getId() <= maxId && !idsToPreserve.contains(build.getId())) {+ logger.debug("Deleting " + build.getReference() + "...");+ delete(build);+ }+ }+ firstResult.set(firstResult.get() + CLEANUP_BATCH);+ return builds.size() == CLEANUP_BATCH;+ })) {}+ }+ }- EntityCriteria<Build> criteria = newCriteria();- AtomicInteger firstResult = new AtomicInteger(0);-- while (transactionManager.call(() -> {- List<Build> builds = query(criteria, firstResult.get(), CLEANUP_BATCH);- if (!builds.isEmpty()) {- logger.debug("Checking build preservation: {}->{}",- firstResult.get()+1, firstResult.get()+builds.size());- }- for (Build build: builds) {- if (build.isFinished() && build.getId() <= maxId && !idsToPreserve.contains(build.getId())) {- logger.debug("Deleting " + build.getReference() + "...");- delete(build);- }- }- firstResult.set(firstResult.get() + CLEANUP_BATCH);- return builds.size() == CLEANUP_BATCH;- })) {}- }+ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(2, 0);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}@SuppressWarnings("unchecked")diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex df3da3e37e..85b092d5d6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -98,6 +98,7 @@ import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;@@ -114,6 +115,9 @@ import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.Input;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.ProjectScopedCommit;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.patternset.PatternSet;@@ -123,8 +127,10 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>private static final Logger logger = LoggerFactory.getLogger(DefaultIssueChangeManager.class);+ private static final int NO_ACTIVITY_TRANSITION_PRIORITY = 40;+private static final int MAX_FIXED_ISSUES = 1000;-+private final IssueManager issueManager;private final IssueFieldManager issueFieldManager;@@ -144,6 +150,10 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>private final ClusterManager clusterManager;private final ReferenceChangeManager entityReferenceManager;++ private final BatchWorkManager batchWorkManager;++ private final TransactionManager transactionManager;private String taskId;@@ -153,7 +163,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>ProjectManager projectManager, ListenerRegistry listenerRegistry,TaskScheduler taskScheduler, IssueScheduleManager issueScheduleManager,IssueLinkManager issueLinkManager, ClusterManager clusterManager,- ReferenceChangeManager entityReferenceManager) {+ ReferenceChangeManager entityReferenceManager, BatchWorkManager batchWorkManager,+ TransactionManager transactionManager) {super(dao);this.issueManager = issueManager;this.issueFieldManager = issueFieldManager;@@ -165,6 +176,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>this.issueLinkManager = issueLinkManager;this.clusterManager = clusterManager;this.entityReferenceManager = entityReferenceManager;+ this.batchWorkManager = batchWorkManager;+ this.transactionManager = transactionManager;}@Transactional@@ -701,39 +714,48 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>}}- @Transactional@Overridepublic void execute() {- if (clusterManager.isLeaderServer()) {- IssueQueryParseOption option = new IssueQueryParseOption();- for (TransitionSpec transition: getTransitionSpecs()) {- if (transition instanceof NoActivitySpec) {- NoActivitySpec noActivitySpec = (NoActivitySpec) transition;- IssueQuery query = IssueQuery.parse(null, noActivitySpec.getIssueQuery(), option, false);- List<Criteria<Issue>> criterias = new ArrayList<>();-- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();- for (String fromState: transition.getFromStates())- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));-- if (!fromStateCriterias.isEmpty())- criterias.add(Criteria.orCriterias(fromStateCriterias));- if (query.getCriteria() != null)- criterias.add(query.getCriteria());-- criterias.add(new LastActivityDateCriteria(- new DateTime().minusDays(noActivitySpec.getDays()).toDate(),- IssueQueryLexer.IsUntil));-- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());-- for (Issue issue: issueManager.query(null, query, true, 0, MAX_VALUE)) {- changeState(issue, noActivitySpec.getToState(), new HashMap<>(),- transition.getRemoveFields(), null);- }- }+ batchWorkManager.submit(new BatchWorker("no-activity-issue-transition") {++ @Override+ public void doWorks(List<Prioritized> works) {+ transactionManager.run(() -> {+ if (clusterManager.isLeaderServer()) {+ IssueQueryParseOption option = new IssueQueryParseOption();+ for (TransitionSpec transition: getTransitionSpecs()) {+ if (transition instanceof NoActivitySpec) {+ NoActivitySpec noActivitySpec = (NoActivitySpec) transition;+ IssueQuery query = IssueQuery.parse(null, noActivitySpec.getIssueQuery(), option, false);+ List<Criteria<Issue>> criterias = new ArrayList<>();++ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();+ for (String fromState: transition.getFromStates())+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));++ if (!fromStateCriterias.isEmpty())+ criterias.add(Criteria.orCriterias(fromStateCriterias));+ if (query.getCriteria() != null)+ criterias.add(query.getCriteria());++ criterias.add(new LastActivityDateCriteria(+ new DateTime().minusDays(noActivitySpec.getDays()).toDate(),+ IssueQueryLexer.IsUntil));++ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());++ for (Issue issue: issueManager.query(null, query, true, 0, MAX_VALUE)) {+ changeState(issue, noActivitySpec.getToState(), new HashMap<>(),+ transition.getRemoveFields(), null);+ }+ }+ }+ }+ });}- }++ }, new Prioritized(NO_ACTIVITY_TRANSITION_PRIORITY));+}@Sessional@@ -748,7 +770,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(1, 0);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}@Listendiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.javaindex 30fedef8bd..dc5ae74dfd 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java@@ -1,6 +1,47 @@package io.onedev.server.entitymanager.impl;+import static io.onedev.commons.utils.LockUtils.read;+import static io.onedev.commons.utils.LockUtils.write;+import static io.onedev.server.model.JobCache.PROP_ACCESS_DATE;+import static io.onedev.server.model.JobCache.PROP_KEY;+import static io.onedev.server.model.JobCache.PROP_PROJECT;+import static io.onedev.server.util.IOUtils.BUFFER_SIZE;+import static java.nio.charset.StandardCharsets.UTF_8;+import static java.util.Comparator.comparing;++import java.io.BufferedOutputStream;+import java.io.ByteArrayInputStream;+import java.io.File;+import java.io.FileInputStream;+import java.io.FileNotFoundException;+import java.io.FileOutputStream;+import java.io.FilterOutputStream;+import java.io.IOException;+import java.io.InputStream;+import java.io.ObjectStreamException;+import java.io.OutputStream;+import java.io.SequenceInputStream;+import java.io.Serializable;+import java.util.Date;+import java.util.List;+import java.util.function.Consumer;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.commons.lang3.tuple.ImmutablePair;+import org.apache.commons.lang3.tuple.Pair;+import org.hibernate.criterion.Restrictions;+import org.hibernate.exception.ConstraintViolationException;+import org.joda.time.DateTime;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Joiner;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;@@ -19,36 +60,17 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.IOUtils;-import org.apache.commons.lang3.tuple.ImmutablePair;-import org.apache.commons.lang3.tuple.Pair;-import org.hibernate.criterion.Restrictions;-import org.hibernate.exception.ConstraintViolationException;-import org.joda.time.DateTime;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import javax.annotation.Nullable;-import javax.inject.Inject;-import javax.inject.Singleton;-import java.io.*;-import java.util.Date;-import java.util.List;-import java.util.function.Consumer;--import static io.onedev.commons.utils.LockUtils.read;-import static io.onedev.commons.utils.LockUtils.write;-import static io.onedev.server.model.JobCache.*;-import static io.onedev.server.util.IOUtils.BUFFER_SIZE;-import static java.nio.charset.StandardCharsets.UTF_8;-import static java.util.Comparator.comparing;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;@Singletonpublic class DefaultJobCacheManager extends BaseEntityManager<JobCache>implements JobCacheManager, Serializable, SchedulableTask {private static final int CACHE_VERSION = 2;++ private static final int HOUSE_KEEPING_PRIORITY = 50;private static final Logger logger = LoggerFactory.getLogger(DefaultJobCacheManager.class);@@ -57,16 +79,19 @@ public class DefaultJobCacheManager extends BaseEntityManager<JobCache>private final TransactionManager transactionManager;private final TaskScheduler taskScheduler;++ private final BatchWorkManager batchWorkManager;private volatile String taskId;@Injectpublic DefaultJobCacheManager(Dao dao, ProjectManager projectManager, TransactionManager transactionManager,- TaskScheduler taskScheduler) {+ TaskScheduler taskScheduler, BatchWorkManager batchWorkManager) {super(dao);this.projectManager = projectManager;this.transactionManager = transactionManager;this.taskScheduler = taskScheduler;+ this.batchWorkManager = batchWorkManager;}@Nullable@@ -363,28 +388,35 @@ public class DefaultJobCacheManager extends BaseEntityManager<JobCache>@Overridepublic void execute() {- var now = new DateTime();- for (var projectId: projectManager.getActiveIds()) {- transactionManager.run(() -> {- try {- var project = projectManager.load(projectId);- var preserveDays = project.getHierarchyCachePreserveDays();- var threshold = now.minusDays(preserveDays);- var criteria = newCriteria();- criteria.add(Restrictions.eq(PROP_PROJECT, project));- criteria.add(Restrictions.lt(PROP_ACCESS_DATE, threshold.toDate()));- for (var cache: query(criteria))- delete(cache);- } catch (Exception e) {- logger.error("Error cleaning up job caches", e);+ batchWorkManager.submit(new BatchWorker("job-cache-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ var now = new DateTime();+ for (var projectId: projectManager.getActiveIds()) {+ transactionManager.run(() -> {+ try {+ var project = projectManager.load(projectId);+ var preserveDays = project.getHierarchyCachePreserveDays();+ var threshold = now.minusDays(preserveDays);+ var criteria = newCriteria();+ criteria.add(Restrictions.eq(PROP_PROJECT, project));+ criteria.add(Restrictions.lt(PROP_ACCESS_DATE, threshold.toDate()));+ for (var cache: query(criteria))+ delete(cache);+ } catch (Exception e) {+ logger.error("Error cleaning up job caches", e);+ }+ });}- });- }+ }++ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(2, 30);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.javaindex c4e807232e..c1195b7647 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPackBlobManager.java@@ -29,6 +29,7 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;+import java.util.List;import java.util.UUID;import javax.inject.Inject;@@ -78,11 +79,16 @@ import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.Digest;import io.onedev.server.util.Pair;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;@Singletonpublic class DefaultPackBlobManager extends BaseEntityManager<PackBlob>implements PackBlobManager, Serializable, SchedulableTask {+ private static final int HOUSE_KEEPING_PRIORITY = 50;+private static final String TEMP_BLOB_SUFFIX = ".temp";private static final int EXPIRE_MILLIS = 24*3600*1000;@@ -99,18 +105,21 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>private final StorageManager storageManager;+ private final BatchWorkManager batchWorkManager;+private volatile String taskId;@Injectpublic DefaultPackBlobManager(Dao dao, ClusterManager clusterManager, ProjectManager projectManager,TransactionManager transactionManager, TaskScheduler taskScheduler,- StorageManager storageManager) {+ StorageManager storageManager, BatchWorkManager batchWorkManager) {super(dao);this.clusterManager = clusterManager;this.projectManager = projectManager;this.taskScheduler = taskScheduler;this.transactionManager = transactionManager;this.storageManager = storageManager;+ this.batchWorkManager = batchWorkManager;}@Listen@@ -515,59 +524,66 @@ public class DefaultPackBlobManager extends BaseEntityManager<PackBlob>@Overridepublic void execute() {- var now = new Date();- for (var projectId: projectManager.getActiveIds()) {- var project = projectManager.findFacadeById(projectId);- if (project != null) {- for (var uploadFile: projectManager.getSubDir(projectId, UPLOADS_DIR).listFiles()) {- if (now.getTime() - uploadFile.lastModified() > EXPIRE_MILLIS)- FileUtils.deleteFile(uploadFile);+ batchWorkManager.submit(new BatchWorker("pack-blob-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ var now = new Date();+ for (var projectId: projectManager.getActiveIds()) {+ var project = projectManager.findFacadeById(projectId);+ if (project != null) {+ for (var uploadFile: projectManager.getSubDir(projectId, UPLOADS_DIR).listFiles()) {+ if (now.getTime() - uploadFile.lastModified() > EXPIRE_MILLIS)+ FileUtils.deleteFile(uploadFile);+ }+ }}- }- }- if (clusterManager.isLeaderServer()) {- transactionManager.run(() -> {- var builder = getSession().getCriteriaBuilder();- var criteriaQuery = builder.createQuery(PackBlob.class);- var root = criteriaQuery.from(PackBlob.class);- criteriaQuery.select(root);-- var referenceQuery = criteriaQuery.subquery(PackBlobReference.class);- var referenceRoot = referenceQuery.from(PackBlobReference.class);- referenceQuery.select(referenceRoot);- referenceQuery.where(builder.equal(referenceRoot.get(PROP_PACK_BLOB), root));-- var expireTime = new DateTime(now).minusMillis(EXPIRE_MILLIS).toDate();- criteriaQuery.where(- builder.not(builder.exists(referenceQuery)),- builder.lessThan(root.get(PROP_CREATE_DATE), expireTime));-- for (var packBlob: getSession().createQuery(criteriaQuery).getResultList()) {- var projectId = packBlob.getProject().getId();- var hash = packBlob.getSha256Hash();- projectManager.runOnActiveServer(projectId, () -> {- var blobFile = getPackBlobFile(projectId, hash);- var deleted = write(getFileLockName(projectId, hash), () -> {- if (blobFile.exists()) {- FileUtils.deleteFile(blobFile);- return true;- } else {- return false;- }- });- if (deleted)- projectManager.directoryModified(projectId, blobFile.getParentFile());- return null;+ if (clusterManager.isLeaderServer()) {+ transactionManager.run(() -> {+ var builder = getSession().getCriteriaBuilder();+ var criteriaQuery = builder.createQuery(PackBlob.class);+ var root = criteriaQuery.from(PackBlob.class);+ criteriaQuery.select(root);++ var referenceQuery = criteriaQuery.subquery(PackBlobReference.class);+ var referenceRoot = referenceQuery.from(PackBlobReference.class);+ referenceQuery.select(referenceRoot);+ referenceQuery.where(builder.equal(referenceRoot.get(PROP_PACK_BLOB), root));++ var expireTime = new DateTime(now).minusMillis(EXPIRE_MILLIS).toDate();+ criteriaQuery.where(+ builder.not(builder.exists(referenceQuery)),+ builder.lessThan(root.get(PROP_CREATE_DATE), expireTime));++ for (var packBlob: getSession().createQuery(criteriaQuery).getResultList()) {+ var projectId = packBlob.getProject().getId();+ var hash = packBlob.getSha256Hash();+ projectManager.runOnActiveServer(projectId, () -> {+ var blobFile = getPackBlobFile(projectId, hash);+ var deleted = write(getFileLockName(projectId, hash), () -> {+ if (blobFile.exists()) {+ FileUtils.deleteFile(blobFile);+ return true;+ } else {+ return false;+ }+ });+ if (deleted)+ projectManager.directoryModified(projectId, blobFile.getParentFile());+ return null;+ });+ delete(packBlob);+ }});- delete(packBlob);}- });- }+ }++ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(0, 30);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}public Object writeReplace() throws ObjectStreamException {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 9309a5c43f..85e52600b8 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@@ -209,6 +209,8 @@ public class DefaultProjectManager extends BaseEntityManager<Project>private static final int SYNC_PRIORITY = 20;+ private static final int HOUSE_KEEPING_PRIORITY = 30;+private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);private final CommitInfoManager commitInfoManager;@@ -1898,62 +1900,70 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Overridepublic void execute() {- if (clusterManager.isLeaderServer()) {- var newActiveServers = new HashMap<Long, String>();- var replicaCount = settingManager.getClusterSetting().getReplicaCount();- for (var projectToReplicas: replicas.entrySet()) {- var projectId = projectToReplicas.getKey();- var replicasOfProject = projectToReplicas.getValue();- while (true) {- var newReplicasOfProject = new LinkedHashMap<>(replicasOfProject);- if (!newReplicasOfProject.isEmpty()) {- var activeServer = getActiveServer(projectId, false);- var replica = newReplicasOfProject.get(activeServer);- if (replica == null || replica.getType() != PRIMARY)- newActiveServers.put(projectId, updateActiveServer(projectId, newReplicasOfProject, true));- var maxVersion = newReplicasOfProject.values().stream()- .map(ProjectReplica::getVersion)- .max(naturalOrder())- .get();- var upToDateReplicaCount = newReplicasOfProject.values().stream()- .filter(it -> it.getVersion() == maxVersion && it.getType() != REDUNDANT)- .count();- if (upToDateReplicaCount >= replicaCount) {- var redundantServers = newReplicasOfProject.entrySet().stream()- .filter(it -> it.getValue().getType() == REDUNDANT)- .map(Map.Entry::getKey)- .collect(toList());- newReplicasOfProject.keySet().removeAll(redundantServers);- if (!newReplicasOfProject.equals(replicasOfProject)) {- if (replicas.replace(projectId, replicasOfProject, newReplicasOfProject)) {- redundantServers.forEach(it -> clusterManager.submitToServer(it, () -> {- markStorageForDelete(projectId);- return null;- }));- break;- } else {- replicasOfProject = replicas.get(projectId);- if (replicasOfProject == null)+ batchWorkManager.submit(new BatchWorker("project-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ if (clusterManager.isLeaderServer()) {+ var newActiveServers = new HashMap<Long, String>();+ var replicaCount = settingManager.getClusterSetting().getReplicaCount();+ for (var projectToReplicas: replicas.entrySet()) {+ var projectId = projectToReplicas.getKey();+ var replicasOfProject = projectToReplicas.getValue();+ while (true) {+ var newReplicasOfProject = new LinkedHashMap<>(replicasOfProject);+ if (!newReplicasOfProject.isEmpty()) {+ var activeServer = getActiveServer(projectId, false);+ var replica = newReplicasOfProject.get(activeServer);+ if (replica == null || replica.getType() != PRIMARY)+ newActiveServers.put(projectId, updateActiveServer(projectId, newReplicasOfProject, true));+ var maxVersion = newReplicasOfProject.values().stream()+ .map(ProjectReplica::getVersion)+ .max(naturalOrder())+ .get();+ var upToDateReplicaCount = newReplicasOfProject.values().stream()+ .filter(it -> it.getVersion() == maxVersion && it.getType() != REDUNDANT)+ .count();+ if (upToDateReplicaCount >= replicaCount) {+ var redundantServers = newReplicasOfProject.entrySet().stream()+ .filter(it -> it.getValue().getType() == REDUNDANT)+ .map(Map.Entry::getKey)+ .collect(toList());+ newReplicasOfProject.keySet().removeAll(redundantServers);+ if (!newReplicasOfProject.equals(replicasOfProject)) {+ if (replicas.replace(projectId, replicasOfProject, newReplicasOfProject)) {+ redundantServers.forEach(it -> clusterManager.submitToServer(it, () -> {+ markStorageForDelete(projectId);+ return null;+ }));+ break;+ } else {+ replicasOfProject = replicas.get(projectId);+ if (replicasOfProject == null)+ break;+ }+ } else {break;+ }+ } else {+ break;}} else {break;}- } else {- break;+ try {+ Thread.sleep(100);+ } catch (InterruptedException e) {+ throw new RuntimeException(e);+ }}- } else {- break;- }- try {- Thread.sleep(100);- } catch (InterruptedException e) {- throw new RuntimeException(e);}+ notifyActiveServerChanged(newActiveServers);}+}- notifyActiveServerChanged(newActiveServers);- }++ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}private void markStorageForDelete(Long projectId) {@@ -1968,7 +1978,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(3, 0);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}private static class SyncWork extends Prioritized {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultReviewedDiffManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultReviewedDiffManager.javaindex eed47ee471..5531dea342 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultReviewedDiffManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultReviewedDiffManager.java@@ -1,43 +1,61 @@package io.onedev.server.entitymanager.impl;+import static io.onedev.server.model.ReviewedDiff.PROP_NEW_COMMIT_HASH;+import static io.onedev.server.model.ReviewedDiff.PROP_OLD_COMMIT_HASH;+import static io.onedev.server.model.ReviewedDiff.PROP_USER;++import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;+import org.joda.time.DateTime;+import org.quartz.CronScheduleBuilder;+import org.quartz.ScheduleBuilder;+import io.onedev.server.entitymanager.ReviewedDiffManager;import io.onedev.server.event.Listen;import io.onedev.server.event.system.SystemStarting;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.model.ReviewedDiff;import io.onedev.server.model.User;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.taskschedule.SchedulableTask;import io.onedev.server.taskschedule.TaskScheduler;-import org.hibernate.criterion.Restrictions;-import org.joda.time.DateTime;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.util.HashMap;-import java.util.Map;--import static io.onedev.server.model.ReviewedDiff.*;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;@Singletonpublic class DefaultReviewedDiffManager extends BaseEntityManager<ReviewedDiff>implements ReviewedDiffManager, SchedulableTask {private static final int MAX_PRESERVE_DAYS = 365;++ private static final int HOUSE_KEEPING_PRIORITY = 50;private final TaskScheduler taskScheduler;++ private final BatchWorkManager batchWorkManager;++ private final TransactionManager transactionManager;private volatile String taskId;@Inject- public DefaultReviewedDiffManager(Dao dao, TaskScheduler taskScheduler) {+ public DefaultReviewedDiffManager(Dao dao, TaskScheduler taskScheduler, BatchWorkManager batchWorkManager,+ TransactionManager transactionManager) {super(dao);this.taskScheduler = taskScheduler;+ this.batchWorkManager = batchWorkManager;+ this.transactionManager = transactionManager;}@Sessional@@ -69,17 +87,25 @@ public class DefaultReviewedDiffManager extends BaseEntityManager<ReviewedDiff>taskScheduler.unschedule(taskId);}- @Transactional@Overridepublic void execute() {- var query = getSession().createQuery("delete from ReviewedDiff where date < :date");- query.setParameter("date", new DateTime().minusDays(MAX_PRESERVE_DAYS).toDate());- query.executeUpdate();+ batchWorkManager.submit(new BatchWorker("reviewed-diff-manager-house-keeping") {++ @Override+ public void doWorks(List<Prioritized> works) {+ transactionManager.run(() -> {+ var query = getSession().createQuery("delete from ReviewedDiff where date < :date");+ query.setParameter("date", new DateTime().minusDays(MAX_PRESERVE_DAYS).toDate());+ query.executeUpdate();+ });+ }++ }, new Prioritized(HOUSE_KEEPING_PRIORITY));}@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(2, 30);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 1441c9fb13..9230afc4fc 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -60,7 +60,7 @@ import io.onedev.server.util.concurrent.WorkExecutor;@Singletonpublic class GitFilter implements Filter {- public static final int PRIORITY = 2;+ public static final int PACK_PRIORITY = 2;private static final String INFO_REFS = "info/refs";@@ -176,7 +176,7 @@ public class GitFilter implements Filter {if (activeServer.equals(clusterManager.getLocalServerAddress())) {File gitDir = projectManager.getGitDir(projectId);if (upload) {- workExecutor.submit(PRIORITY, new Runnable() {+ workExecutor.submit(PACK_PRIORITY, new Runnable() {@Overridepublic void run() {@@ -185,7 +185,7 @@ public class GitFilter implements Filter {}).get();} else {- workExecutor.submit(PRIORITY, new Runnable() {+ workExecutor.submit(PACK_PRIORITY, new Runnable() {@Overridepublic void run() {diff --git a/server-core/src/main/java/io/onedev/server/git/SshCommand.java b/server-core/src/main/java/io/onedev/server/git/SshCommand.javaindex f087cbeb7a..52e7fdf529 100644--- a/server-core/src/main/java/io/onedev/server/git/SshCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/SshCommand.java@@ -49,7 +49,7 @@ import io.onedev.server.util.concurrent.WorkExecutor;class SshCommand implements Command, ServerSessionAware {- private static final int PRIORITY = 2;+ private static final int PACK_PRIORITY = 2;private static final int CHANNEL_OPEN_TIMEOUT = 5000;@@ -142,7 +142,7 @@ class SshCommand implements Command, ServerSessionAware {String groupId = "git-over-ssh-" + projectFacade.getId() + "-" + principal;WorkExecutor workExecutor = OneDev.getInstance(WorkExecutor.class);- future = workExecutor.submit(PRIORITY, groupId, new Runnable() {+ future = workExecutor.submit(PACK_PRIORITY, groupId, new Runnable() {@Overridepublic void run() {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 371c257e34..e030e8c316 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@@ -161,6 +161,9 @@ import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;import io.onedev.server.terminal.WebShell;import io.onedev.server.util.CommitAware;+import io.onedev.server.util.concurrent.BatchWorkManager;+import io.onedev.server.util.concurrent.BatchWorker;+import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.interpolative.VariableInterpolator;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.EditableStringTransformer;@@ -171,6 +174,8 @@ import nl.altindag.ssl.SSLFactory;public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizationSource, Serializable {private static final int CHECK_INTERVAL = 1000; // check internal in milli-seconds++ private static final int MAINTENANCE_PRIORITY = 50;private static final String TIMEOUT_MESSAGE = "Job execution timed out";@@ -226,6 +231,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizprivate final SSLFactory sslFactory;+ private final BatchWorkManager batchWorkManager;+private volatile Thread thread;private final Map<String, JobContext> jobContexts = new ConcurrentHashMap<>();@@ -247,7 +254,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizBuildParamManager buildParamManager, ProjectManager projectManager, Validator validator,TaskScheduler taskScheduler, ClusterManager clusterManager, CodeIndexManager codeIndexManager,PullRequestManager pullRequestManager, IssueManager issueManager, GitService gitService,- SSLFactory sslFactory, Dao dao) {+ SSLFactory sslFactory, Dao dao, BatchWorkManager batchWorkManager) {this.dao = dao;this.settingManager = settingManager;this.buildManager = buildManager;@@ -268,6 +275,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizthis.issueManager = issueManager;this.gitService = gitService;this.sslFactory = sslFactory;+ this.batchWorkManager = batchWorkManager;}public Object writeReplace() throws ObjectStreamException {@@ -1128,18 +1136,26 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void execute() {- if (clusterManager.isLeaderServer()) {- var activeJobTokens = getActiveJobTokens();- jobServers.removeAll(it -> !activeJobTokens.contains(it.getKey()));- }+ batchWorkManager.submit(new BatchWorker("job-manager-maintenance") {++ @Override+ public void doWorks(List<Prioritized> works) {+ if (clusterManager.isLeaderServer()) {+ var activeJobTokens = getActiveJobTokens();+ jobServers.removeAll(it -> !activeJobTokens.contains(it.getKey()));+ }+ }++ }, new Prioritized(MAINTENANCE_PRIORITY));}@Overridepublic ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.dailyAtHourAndMinute(4, 0);+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);}});+branchSchedulesTaskId = taskScheduler.schedule(new SchedulableTask() {@Overridepublic void execute() {diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.javaindex fc11f473a3..b2b3936c8a 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java@@ -108,7 +108,7 @@ public abstract class EntityTextManager<T extends ProjectBelonging> implements Sprotected static final String FIELD_PROJECT_ID = "projectId";- private static final int INDEXING_PRIORITY = 100;+ private static final int PRIORITY = 100;private static final int BATCH_SIZE = 5000;@@ -325,7 +325,7 @@ public abstract class EntityTextManager<T extends ProjectBelonging> implements S}};- batchWorkManager.submit(batchWorker, new IndexWork(INDEXING_PRIORITY));+ batchWorkManager.submit(batchWorker, new IndexWork(PRIORITY));}private Query parse(String queryString) {diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.javaindex 7b3a699a46..255c31f2f5 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java@@ -183,7 +183,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManagerprivate static final ByteIterable COMMIT_COUNT_KEY = new StringByteIterable("commitCount");- private static final int PRIORITY = 100;+ private static final int COLLECT_PRIORITY = 100;private final BatchWorkManager batchWorkManager;@@ -1127,7 +1127,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager}if (revObj instanceof RevCommit) {RevCommit commit = (RevCommit) revObj;- works.add(new CollectingWork(PRIORITY, commit.copy(),+ works.add(new CollectingWork(COLLECT_PRIORITY, commit.copy(),commit.getCommitTime(), ref.getName()));}}@@ -1186,7 +1186,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManagertry (RevWalk revWalk = new RevWalk(repository)) {RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewCommitId());if (commit != null) {- CollectingWork work = new CollectingWork(PRIORITY, commit.copy(),+ CollectingWork work = new CollectingWork(COLLECT_PRIORITY, commit.copy(),commit.getCommitTime(), event.getRefName());batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);}diff --git a/server-ee b/server-eeindex 434a3f4f7f..32e2730088 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 434a3f4f7f4951e1cc08674c33a968210d888da4+Subproject commit 32e27300885177aceba96d80812e71e0867e01da