The Unified and Autonomous Development Platform
Add job scheduler test page and fix job scheduler bugs
Robin Shencd17330cc684
diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.javaindex 2ef8c336b9..7f80046e52 100644--- a/core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java@@ -66,7 +66,7 @@ public class CISpec implements Serializable, Validatable {for (int i=0; i<jobs.size(); i++) {Job job = jobs.get(i);for (Dependency dependency: job.getDependencies()) {- if (!jobMap.containsKey(dependency.getJobName())) {+ if (!getJobMap().containsKey(dependency.getJobName())) {context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName()).addPropertyNode("jobs").addPropertyNode("dependencies").inIterable().atIndex(i)@@ -80,7 +80,7 @@ public class CISpec implements Serializable, Validatable {Job job = jobs.get(i);for (Dependency dependency: job.getDependencies()) {List<String> dependencyChain = Lists.newArrayList(job.getName());- if (hasCircularDependencies(jobMap, dependencyChain, dependency.getJobName())) {+ if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain).addPropertyNode("jobs").addPropertyNode("dependencies").inIterable().atIndex(i)@@ -95,7 +95,7 @@ public class CISpec implements Serializable, Validatable {return valid;}- private boolean hasCircularDependencies(Map<String, Job> jobMap, List<String> dependencyChain, String jobName) {+ private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {if (dependencyChain.iterator().next().equals(jobName)) {dependencyChain.add(jobName);return true;@@ -104,10 +104,10 @@ public class CISpec implements Serializable, Validatable {return false;} else {dependencyChain.add(jobName);- Job job = jobMap.get(jobName);+ Job job = getJobMap().get(jobName);if (job != null) {for (Dependency dependency: job.getDependencies()) {- if (hasCircularDependencies(jobMap, new ArrayList<>(dependencyChain), dependency.getJobName()))+ if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))return true;}}diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.javaindex 97b215a7af..093a56beca 100644--- a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java@@ -8,10 +8,13 @@ import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import org.eclipse.jgit.lib.ObjectId;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;@@ -19,6 +22,7 @@ import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.jobparam.JobParam;import io.onedev.server.ci.jobtrigger.JobTrigger;import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.CommitAware;@@ -34,6 +38,7 @@ import io.onedev.server.model.Build2;import io.onedev.server.model.BuildDependence;import io.onedev.server.model.BuildParam;import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.jobexecutor.JobExecutor;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;@@ -43,10 +48,14 @@ import io.onedev.server.util.MatrixRunner;@Singletonpublic class DefaultJobScheduler implements JobScheduler, Runnable {- private static final int CHECK_INTERVAL = 10;+ private static final int CHECK_INTERVAL = 5;++ private static final Logger logger = LoggerFactory.getLogger(DefaultJobScheduler.class);private enum Status {RUNNING, STOPPING, STOPPED};+ private final ProjectManager projectManager;+private final Build2Manager buildManager;private final UserManager userManager;@@ -62,9 +71,11 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {private volatile Status status;@Inject- public DefaultJobScheduler(Build2Manager buildManager, UserManager userManager,- ListenerRegistry listenerRegistry, TransactionManager transactionManager,- ExecutorService executorService, SettingManager settingManager) {+ public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,+ UserManager userManager, ListenerRegistry listenerRegistry,+ TransactionManager transactionManager, ExecutorService executorService,+ SettingManager settingManager) {+ this.projectManager = projectManager;this.buildManager = buildManager;this.userManager = userManager;this.listenerRegistry = listenerRegistry;@@ -75,8 +86,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Sessional@Override- public void submit(Project project, String commitHash, String jobName, Map<String, String> paramMap) {+ public void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix) {String commitLock = "job-schedule: " + project.getId() + "-" + commitHash;+ Long projectId = project.getId();+ Long userId = User.idOf(userManager.getCurrent());executorService.execute(new Runnable() {@Override@@ -89,7 +102,16 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Overridepublic void run() {- submit(project, commitHash, jobName, paramMap, new ArrayList<>());+ Project project = projectManager.load(projectId);+ User user = (userId != null? userManager.load(userId): null);+ new MatrixRunner(paramMatrix).run(new MatrixRunner.Runnable() {++ @Override+ public void run(Map<String, String> params) {+ submit(project, user, commitHash, jobName, params, new ArrayList<>());+ }++ });}});@@ -109,17 +131,19 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {return paramMatrix;}- private void submit(Project project, String commitHash, String jobName,+ private List<Build2> submit(Project project, @Nullable User user, String commitHash, String jobName,Map<String, String> paramMap, List<String> dependencyChain) {- Build2 build = buildManager.find(project, commitHash, jobName, paramMap);- if (build == null) {- build = new Build2();+ List<Build2> builds = buildManager.query(project, commitHash, jobName, paramMap);+ if (builds.isEmpty()) {+ Build2 build = new Build2();build.setProject(project);build.setCommitHash(commitHash);build.setJobName(jobName);build.setSubmitDate(new Date());build.setStatus(Build2.Status.WAITING);- build.setUser(userManager.getCurrent());+ build.setUser(user);++ builds.add(build);for (Map.Entry<String, String> entry: paramMap.entrySet()) {BuildParam param = new BuildParam();@@ -132,7 +156,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (dependencyChain.contains(jobName)) {dependencyChain.add(jobName);markBuildError(build, "Circular job dependencies found: " + dependencyChain);- return;+ return builds;}dependencyChain.add(jobName);@@ -140,13 +164,13 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {CISpec ciSpec = project.getCISpec(ObjectId.fromString(commitHash));if (ciSpec == null) {markBuildError(build, "No CI spec");- return;+ return builds;}Job job = ciSpec.getJobMap().get(jobName);if (job == null) {markBuildError(build, "Job not found");- return;+ return builds;}for (Dependency dependency: job.getDependencies()) {@@ -154,7 +178,14 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Overridepublic void run(Map<String, String> params) {- submit(project, commitHash, dependency.getJobName(), params, new ArrayList<>(dependencyChain));+ List<Build2> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),+ params, new ArrayList<>(dependencyChain));+ for (Build2 dependencyBuild: dependencyBuilds) {+ BuildDependence dependence = new BuildDependence();+ dependence.setDependency(dependencyBuild);+ dependence.setDependent(build);+ build.getDependencies().add(dependence);+ }}});@@ -163,6 +194,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {buildManager.create(build);listenerRegistry.post(new BuildSubmitted(build));}+ return builds;}private void run(Build2 build) {@@ -183,13 +215,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {private void markBuildError(Build2 build, String errorMessage) {build.setErrorMessage(errorMessage);- build.setStatus(Build2.Status.FAILED);- if (build.getPendingDate() == null)- build.setPendingDate(new Date());- if (build.getRunningDate() == null)- build.setRunningDate(new Date());- if (build.getFinishDate() == null)- build.setFinishDate(new Date());+ build.setStatus(Build2.Status.IN_ERROR);+ build.setFinishDate(new Date());buildManager.save(build);listenerRegistry.post(new BuildFinished(build));}@@ -203,16 +230,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (ciSpec != null) {for (Job job: ciSpec.getJobs()) {JobTrigger trigger = job.getMatchedTrigger(event);- if (trigger != null) {- new MatrixRunner(getParamMatrix(trigger.getParams())).run(new MatrixRunner.Runnable() {-- @Override- public void run(Map<String, String> params) {- submit(event.getProject(), commitId.name(), job.getName(), params);- }-- });- }+ if (trigger != null)+ submit(event.getProject(), commitId.name(), job.getName(), getParamMatrix(trigger.getParams()));}}}@@ -224,7 +243,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {for (BuildDependence dependence: build.getDependents())resubmit(dependence.getDependent());- if (build.getStatus() == Build2.Status.FAILED || build.getStatus() == Build2.Status.SUCCESSFUL) {+ if (build.isFinished()) {build.setStatus(Build2.Status.WAITING);build.setErrorMessage(null);build.setFinishDate(null);@@ -243,9 +262,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Transactional@Overridepublic void cancel(Build2 build) {- if (build.getStatus() == Build2.Status.WAITING || build.getStatus() == Build2.Status.PENDING) {- markBuildError(build, "Build is cancelled");- } else if (build.getStatus() == Build2.Status.RUNNING) {+ if (build.getStatus() == Build2.Status.RUNNING) {JobExecutor jobExecutor = settingManager.getJobExecutor();if (jobExecutor != null) {if (jobExecutor.isRunning(build))@@ -255,6 +272,12 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {} else {markBuildError(build, "No applicable job executor");}+ } else if (!build.isFinished()) {+ build.setStatus(Build2.Status.CANCELLED);+ build.setErrorMessage(null);+ build.setFinishDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildFinished(build));}}@@ -266,14 +289,16 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Listenpublic void on(SystemStopping event) {- status = Status.STOPPING;- synchronized (this) {- notify();- }- while (status == Status.STOPPING) {- try {- Thread.sleep(100);- } catch (InterruptedException e) {+ if (status == Status.RUNNING) {+ status = Status.STOPPING;+ synchronized (this) {+ notify();+ }+ while (status == Status.STOPPING) {+ try {+ Thread.sleep(100);+ } catch (InterruptedException e) {+ }}}}@@ -285,71 +310,66 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {wait(CHECK_INTERVAL * 1000L);} catch (InterruptedException e) {}- transactionManager.run(new Runnable() {-- @Override- public void run() {- for (Build2 build: buildManager.queryUnfinished()) {- if (build.getStatus() == Build2.Status.PENDING) {- DefaultJobScheduler.this.run(build);- } else if (build.getStatus() == Build2.Status.RUNNING) {- CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));- if (ciSpec != null) {- Job job = ciSpec.getJobMap().get(build.getJobName());- if (job != null) {- if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {- JobExecutor jobExecutor = settingManager.getJobExecutor();- if (jobExecutor != null) {- if (jobExecutor.isRunning(build))- jobExecutor.stop(build);- else- markBuildError(build, "Aborted for unknown reason");- } else {- markBuildError(build, "No applicable job executor");+ try {+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ for (Build2 build: buildManager.queryUnfinished()) {+ if (build.getStatus() == Build2.Status.PENDING) {+ DefaultJobScheduler.this.run(build);+ } else if (build.getStatus() == Build2.Status.RUNNING) {+ CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));+ if (ciSpec != null) {+ Job job = ciSpec.getJobMap().get(build.getJobName());+ if (job != null) {+ if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {+ JobExecutor jobExecutor = settingManager.getJobExecutor();+ if (jobExecutor != null) {+ if (jobExecutor.isRunning(build))+ jobExecutor.stop(build);+ else+ markBuildError(build, "Aborted for unknown reason");+ } else {+ markBuildError(build, "No applicable job executor");+ }}+ } else {+ markBuildError(build, "Job not found");}} else {- markBuildError(build, "Job not found");+ markBuildError(build, "No CI spec");+ }+ } else if (build.getStatus() == Build2.Status.WAITING) {+ boolean hasUnsuccessful = false;+ boolean hasUnfinished = false;++ for (BuildDependence dependence: build.getDependencies()) {+ Build2 dependency = dependence.getDependency();++ if (dependency.getStatus() == Build2.Status.SUCCESSFUL)+ continue;+ else if (dependency.isFinished())+ hasUnsuccessful = true;+ else+ hasUnfinished = true;}- } else {- markBuildError(build, "No CI spec");- }- } else if (build.getStatus() == Build2.Status.WAITING) {- boolean hasFailed = false;- boolean hasUnfinished = false;-- for (BuildDependence dependence: build.getDependencies()) {- Build2 dependency = dependence.getDependency();- switch (dependency.getStatus()) {- case FAILED:- hasFailed = true;- break;- case RUNNING:- case PENDING:- case WAITING:- hasUnfinished = true;- break;- default:+ if (hasUnsuccessful) {+ markBuildError(build, "There are failed dependency jobs");+ } else if (!hasUnfinished) {+ build.setStatus(Build2.Status.PENDING);+ build.setPendingDate(new Date());+ listenerRegistry.post(new BuildPending(build));}}-- if (hasFailed) {- build.setStatus(Build2.Status.FAILED);- build.setPendingDate(new Date());- build.setRunningDate(new Date());- build.setFinishDate(new Date());- listenerRegistry.post(new BuildFinished(build));- } else if (!hasUnfinished) {- build.setStatus(Build2.Status.PENDING);- build.setPendingDate(new Date());- listenerRegistry.post(new BuildPending(build));- }}}- }-- });++ });+ } catch (Exception e) {+ logger.error("Error checking unfinished builds", e);+ }}status = Status.STOPPED;}diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex 770b265523..b578767a5b 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -10,7 +10,6 @@ import io.onedev.server.ci.jobparam.JobParam;import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.PathPatterns;import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies.DependencyEditPanel;@Editable@@ -22,8 +21,6 @@ public class Dependency implements Serializable {private List<JobParam> params = new ArrayList<>();- private String retrieveArtifacts;-@Editable(order=100)@ChoiceProvider("getJobChoices")@NotEmpty@@ -35,7 +32,7 @@ public class Dependency implements Serializable {this.jobName = jobName;}- @Editable(order=200, description="Specify parameters of the dependency job. Dependency is satisfied only when "+ @Editable(name="Job Parameters", order=200, description="Specify parameters of the dependency job. Dependency is satisfied only when "+ "there are builds of the job with same set of parameters specified here")public List<JobParam> getParams() {return params;@@ -45,17 +42,6 @@ public class Dependency implements Serializable {this.params = params;}- @Editable(order=300, description="Optionally specify space-separated artifacts to retrieve into job workspace. "- + "Use * or ? for wildcard match")- @PathPatterns- public String getRetrieveArtifacts() {- return retrieveArtifacts;- }-- public void setRetrieveArtifacts(String retrieveArtifacts) {- this.retrieveArtifacts = retrieveArtifacts;- }-@SuppressWarnings("unused")private static List<String> getJobChoices() {DependencyEditPanel editor = OneContext.get().getComponent().findParent(DependencyEditPanel.class);diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.javaindex 7fa00d65d0..95fe183ae3 100644--- a/core/src/main/java/io/onedev/server/ci/Job.java+++ b/core/src/main/java/io/onedev/server/ci/Job.java@@ -28,6 +28,8 @@ public class Job implements Serializable {private boolean cloneSource = true;+ private boolean retrieveDependencyArtifacts = true;+private String publishArtifacts;private List<Dependency> dependencies = new ArrayList<>();@@ -78,6 +80,15 @@ public class Job implements Serializable {this.cloneSource = cloneSource;}+ @Editable(order=140, description="Whether or not to retrieve artifacts of dependency jobs")+ public boolean isRetrieveDependencyArtifacts() {+ return retrieveDependencyArtifacts;+ }++ public void setRetrieveDependencyArtifacts(boolean retrieveDependencyArtifacts) {+ this.retrieveDependencyArtifacts = retrieveDependencyArtifacts;+ }+@Editable(order=300, description="Specify parameters to prompt when the job "+ "is triggered manually")public List<InputSpec> getPromptParams() {diff --git a/core/src/main/java/io/onedev/server/ci/JobScheduler.java b/core/src/main/java/io/onedev/server/ci/JobScheduler.javaindex 76621a88f7..3fc2b99f17 100644--- a/core/src/main/java/io/onedev/server/ci/JobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/JobScheduler.java@@ -1,5 +1,6 @@package io.onedev.server.ci;+import java.util.List;import java.util.Map;import io.onedev.server.model.Build2;@@ -7,7 +8,7 @@ import io.onedev.server.model.Project;public interface JobScheduler {- void submit(Project project, String commitHash, String jobName, Map<String, String> params);+ void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix);void resubmit(Build2 build);diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.javaindex e7ba79105b..cff0aa7791 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java@@ -37,7 +37,7 @@ public class DependencyBuiltTrigger extends JobTrigger {@Overridepublic String getDescription() {- return "When dependency job finished running";+ return "When dependency jobs finished successfully";}}diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.javaindex 83f139aa04..83fb87178b 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java@@ -16,7 +16,7 @@ public abstract class JobTrigger implements Serializable {private List<JobParam> params = new ArrayList<>();- @Editable(order=1000)+ @Editable(name="Trigger Parameters", order=1000, description="Specify parameters to trigger the job")public List<JobParam> getParams() {return params;}diff --git a/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.javaindex b200ade780..e8a5a247bd 100644--- a/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java@@ -14,8 +14,7 @@ public interface Build2Manager extends EntityManager<Build2> {@NullableBuild2 find(Project project, long number);- @Nullable- Build2 find(Project project, String commitHash, String jobName, Map<String, String> params);+ List<Build2> query(Project project, String commitHash, String jobName, Map<String, String> params);void create(Build2 build);@@ -23,5 +22,5 @@ public interface Build2Manager extends EntityManager<Build2> {Build2 find(String runInstanceId);List<Build2> queryUnfinished();-+}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.javaindex dde0b86599..365d082169 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java@@ -57,7 +57,7 @@ public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implemen@Sessional@Override- public Build2 find(Project project, String commitHash, String jobName, Map<String, String> params) {+ public List<Build2> query(Project project, String commitHash, String jobName, Map<String, String> params) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Build2> query = builder.createQuery(Build2.class);Root<Build2> root = query.from(Build2.class);@@ -72,7 +72,7 @@ public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implemenrestrictions.add(builder.equal(join.get("name"), entry.getKey()));restrictions.add(builder.equal(join.get("value"), entry.getValue()));}- return getSession().createQuery(query.distinct(true).where(restrictions.toArray(new Predicate[0]))).uniqueResult();+ return getSession().createQuery(query.where(restrictions.toArray(new Predicate[0]))).list();}@Sessionaldiff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javaindex b0a870d2e1..87767126c2 100644--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ b/core/src/main/java/io/onedev/server/model/Build2.java@@ -43,7 +43,7 @@ public class Build2 extends AbstractEntity {public static final String STATUS = "status";public enum Status {- WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED+ WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED};@ManyToOne(fetch=FetchType.LAZY)@@ -153,6 +153,11 @@ public class Build2 extends AbstractEntity {this.status = status;}+ public boolean isFinished() {+ return status == Status.IN_ERROR || status == Status.FAILED+ || status == Status.CANCELLED || status == Status.SUCCESSFUL;+ }+public Date getSubmitDate() {return submitDate;}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.javaindex bde71cad84..3bb80d53a5 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java@@ -4,12 +4,14 @@ import java.util.Date;import java.util.HashMap;import java.util.Map;import java.util.UUID;+import java.util.concurrent.atomic.AtomicReference;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.Build2Manager;import io.onedev.server.event.build2.BuildFinished;import io.onedev.server.model.Build2;+import io.onedev.server.model.Build2.Status;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.web.editable.annotation.Editable;@@ -32,19 +34,22 @@ public class SleepyJobExecutor implements JobExecutor {@Overridepublic void run() {+ AtomicReference<Status> statusRef = new AtomicReference<>();try {- Thread.sleep(30000);+ Thread.sleep(10000);+ statusRef.set(Status.SUCCESSFUL);} catch (InterruptedException e) {+ statusRef.set(Status.CANCELLED);+ } finally {synchronized (threads) {threads.remove(runInstanceId);}- } finally {OneDev.getInstance(TransactionManager.class).run(new Runnable() {@Overridepublic void run() {Build2 build = OneDev.getInstance(Build2Manager.class).load(buildId);- build.setStatus(Build2.Status.SUCCESSFUL);+ build.setStatus(statusRef.get());build.setFinishDate(new Date());OneDev.getInstance(ListenerRegistry.class).post(new BuildFinished(build));}@@ -55,6 +60,7 @@ public class SleepyJobExecutor implements JobExecutor {});threads.put(runInstanceId, thread);+ thread.start();return runInstanceId;} else {return null;diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javaindex ec4c993c42..47c4da0f33 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -20,9 +20,11 @@ import java.util.concurrent.Callable;import java.util.concurrent.ExecutorService;import javax.inject.Singleton;+import javax.persistence.FlushModeType;import javax.transaction.Status;import javax.transaction.Synchronization;+import org.hibernate.Session;import org.hibernate.Transaction;import com.google.inject.Inject;@@ -52,15 +54,19 @@ public class DefaultTransactionManager implements TransactionManager {if (getTransaction().isActive()) {return callable.call();} else {- Transaction tx = sessionManager.getSession().beginTransaction();+ Session session = sessionManager.getSession();+ FlushModeType prevFlushModeType = session.getFlushMode();+ Transaction tx = session.beginTransaction();try {+ session.setFlushMode(FlushModeType.AUTO);T result = callable.call();- sessionManager.getSession().flush();tx.commit();return result;} catch (Throwable t) {tx.rollback();throw ExceptionUtils.unchecked(t);+ } finally {+ session.setFlushMode(prevFlushModeType);}}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 60cb763ef7..a3babe4b90 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -45,6 +45,7 @@ import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.builds.BuildListPage;+import io.onedev.server.web.page.project.builds2.BuildListPage2;import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;@@ -280,6 +281,21 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});+ tabs.add(new ProjectTab(Model.of("Builds2"), "fa fa-fw fa-cubes", 0, BuildListPage2.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new ViewStateAwarePageLink<Void>(linkId, BuildListPage2.class, BuildListPage2.paramsOf(getProject()));+ }+ };+ }++ });+if (SecurityUtils.canReadCode(getProject().getFacade())) {tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",0, ProjectCodeCommentsPage.class) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.javaindex 8f0653388a..9e940e3401 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -5,7 +5,6 @@ import java.util.ArrayList;import java.util.Collections;import java.util.List;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -30,7 +29,6 @@ import io.onedev.server.ci.Dependency;import io.onedev.server.ci.Job;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;-import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanEditor;@@ -135,18 +133,6 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("Artifacts")) {-- @Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {- if (StringUtils.isNotBlank(rowModel.getObject().getRetrieveArtifacts()))- cellItem.add(new MultilineLabel(componentId, rowModel.getObject().getRetrieveArtifacts()));- else- cellItem.add(new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false));- }-- });-columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.javaindex 298a828811..0b540b1c3d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -25,7 +24,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.ci.Dependency;-import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;import jersey.repackaged.com.google.common.collect.Sets;@@ -63,25 +61,6 @@ public class DependencyListViewPanel extends Panel {}});- columns.add(new AbstractColumn<Dependency, Void>(Model.of("Artifacts")) {-- @Override- public void populateItem(Item<ICellPopulator<Dependency>> cellItem, String componentId, IModel<Dependency> rowModel) {- cellItem.add(new ColumnFragment(componentId, cellItem.findParent(Item.class).getIndex()) {-- @Override- protected Component newLabel(String componentId) {- String artifacts = rowModel.getObject().getRetrieveArtifacts();- if (StringUtils.isNotBlank(artifacts))- return new MultilineLabel(componentId, artifacts);- else- return new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false);- }-- });- }- });-columns.add(new AbstractColumn<Dependency, Void>(Model.of("")) {@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.html b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.htmlnew file mode 100644index 0000000000..f7fd7be6a4--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.html@@ -0,0 +1,7 @@+<wicket:extend>+ <table wicket:id="builds" class="table table-hover"></table>+ <wicket:fragment wicket:id="actionsFrag">+ <a wicket:id="rebuild">rebuild</a>+ <a wicket:id="cancel">cancel</a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.java b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.javanew file mode 100644index 0000000000..db4874da44--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.java@@ -0,0 +1,191 @@+package io.onedev.server.web.page.project.builds2;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DefaultDataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.ci.JobScheduler;+import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.model.Build2;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;+import io.onedev.server.web.page.project.ProjectPage;++@SuppressWarnings("serial")+public class BuildListPage2 extends ProjectPage {++ public BuildListPage2(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<Build2, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<Build2, Void>(Model.of("#")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ Build2 build = rowModel.getObject();+ cellItem.add(new Label(componentId, build.getNumber()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Status")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ Build2 build = rowModel.getObject();+ cellItem.add(new Label(componentId, build.getStatus()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Error Message")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ Build2 build = rowModel.getObject();+ cellItem.add(new Label(componentId, build.getErrorMessage()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Commit")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getCommitHash()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Job")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getJobName()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Params")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getParamMap().toString()));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Dependencies")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ List<String> dependencyIds = new ArrayList<>();+ for (BuildDependence dependence: rowModel.getObject().getDependencies())+ dependencyIds.add(dependence.getDependency().getNumberStr());+ cellItem.add(new Label(componentId, StringUtils.join(dependencyIds, ", ")));+ }+ });++ columns.add(new AbstractColumn<Build2, Void>(Model.of("Actions")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,+ IModel<Build2> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionsFrag", BuildListPage2.this);+ fragment.add(new Link<Void>("rebuild") {++ @Override+ public void onClick() {+ OneDev.getInstance(JobScheduler.class).resubmit(rowModel.getObject());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(rowModel.getObject().isFinished());+ }++ });+ fragment.add(new Link<Void>("cancel") {++ @Override+ public void onClick() {+ OneDev.getInstance(JobScheduler.class).cancel(rowModel.getObject());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!rowModel.getObject().isFinished());+ }++ });+ cellItem.add(fragment);+ }+ });++ SortableDataProvider<Build2, Void> dataProvider = new LoadableDetachableDataProvider<Build2, Void>() {++ @Override+ public Iterator<? extends Build2> iterator(long first, long count) {+ EntityCriteria<Build2> criteria = getCriteria();+ criteria.addOrder(Order.desc("number"));+ return OneDev.getInstance(Build2Manager.class).query(criteria, (int)first, (int)count).iterator();+ }++ private EntityCriteria<Build2> getCriteria() {+ EntityCriteria<Build2> criteria = EntityCriteria.of(Build2.class);+ criteria.add(Restrictions.eq("project", getProject()));+ return criteria;+ }++ @Override+ public long calcSize() {+ return OneDev.getInstance(Build2Manager.class).count(getCriteria());+ }++ @Override+ public IModel<Build2> model(Build2 object) {+ Long id = object.getId();+ return new LoadableDetachableModel<Build2>() {++ @Override+ protected Build2 load() {+ return OneDev.getInstance(Build2Manager.class).load(id);+ }++ };+ }+ };++ add(new DefaultDataTable<Build2, Void>("builds", columns, dataProvider, WebConstants.PAGE_SIZE));+ }++}