The Unified and Autonomous Development Platform
Fix merge strategy incorrect author issue
Robin Shen341628e69ad1
diff --git a/core/pom.xml b/core/pom.xmlindex 5d9c558d7f..66fbc0c5c1 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -1,5 +1,7 @@<?xml version="1.0" encoding="UTF-8"?>-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">+<project xmlns="http://maven.apache.org/POM/4.0.0"+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"><modelVersion>4.0.0</modelVersion><artifactId>server-core</artifactId><parent>diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.javaindex 093a56beca..9dd1a2fe34 100644--- a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java@@ -200,13 +200,22 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {private void run(Build2 build) {JobExecutor jobExecutor = settingManager.getJobExecutor();if (jobExecutor != null) {- String runInstanceId = jobExecutor.run(build);- if (runInstanceId != null) {- build.setRunInstanceId(runInstanceId);- build.setStatus(Build2.Status.RUNNING);- build.setRunningDate(new Date());- buildManager.save(build);- listenerRegistry.post(new BuildRunning(build));+ CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));+ if (ciSpec != null) {+ Job job = ciSpec.getJobMap().get(build.getJobName());+ if (job != null) {+ String runningInstance = jobExecutor.run(job.getImage(), job.getCommands());+ if (runningInstance != null) {+ build.setStatus(Build2.Status.RUNNING);+ build.setRunningDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildRunning(build));+ }+ } else {+ markBuildError(build, "Job not found");+ }+ } else {+ markBuildError(build, "No CI spec");}} else {markBuildError(build, "No applicable job executor");@@ -248,7 +257,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {build.setErrorMessage(null);build.setFinishDate(null);build.setPendingDate(null);- build.setRunInstanceId(null);+ build.setRunningInstance(null);build.setRunningDate(null);build.setSubmitDate(new Date());build.setUser(userManager.getCurrent());@@ -265,8 +274,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (build.getStatus() == Build2.Status.RUNNING) {JobExecutor jobExecutor = settingManager.getJobExecutor();if (jobExecutor != null) {- if (jobExecutor.isRunning(build))- jobExecutor.stop(build);+ if (jobExecutor.isRunning(build.getRunningInstance()))+ jobExecutor.stop(build.getRunningInstance());elsemarkBuildError(build, "Aborted for unknown reason");} else {@@ -326,8 +335,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {JobExecutor jobExecutor = settingManager.getJobExecutor();if (jobExecutor != null) {- if (jobExecutor.isRunning(build))- jobExecutor.stop(build);+ if (jobExecutor.isRunning(build.getRunningInstance()))+ jobExecutor.stop(build.getRunningInstance());elsemarkBuildError(build, "Aborted for unknown reason");} else {diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.javaindex 95fe183ae3..d2ef274e6f 100644--- a/core/src/main/java/io/onedev/server/ci/Job.java+++ b/core/src/main/java/io/onedev/server/ci/Job.java@@ -4,6 +4,8 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;+import javax.validation.constraints.Size;+import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.ci.jobtrigger.JobTrigger;@@ -11,7 +13,6 @@ import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;-import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.PathPatterns;@Editable@@ -24,7 +25,7 @@ public class Job implements Serializable {private String image;- private String command;+ private List<String> commands;private boolean cloneSource = true;@@ -60,17 +61,16 @@ public class Job implements Serializable {this.image = image;}- @Editable(order=120)- @Multiline- @NotEmpty- public String getCommand() {- return command;+ @Editable(order=120, description="Specify commands to execute, with one command per line")+ @Size(min=1, message="At least one command needs to be specified")+ public List<String> getCommands() {+ return commands;}- public void setCommand(String command) {- this.command = command;+ public void setCommands(List<String> commands) {+ this.commands = commands;}-+@Editable(order=130, description="Whether or not to clone the source code")public boolean isCloneSource() {return cloneSource;diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java b/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.javaindex bf6e89efa8..d21743e28c 100644--- a/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java+++ b/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java@@ -2,12 +2,9 @@ package io.onedev.server.ci.jobparam;import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;--import com.google.common.base.Splitter;+import javax.validation.constraints.Size;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.OmitName;@Editable(order=100, name="Use specified values")@@ -15,22 +12,17 @@ public class SpecifiedValues implements ValueProvider {private static final long serialVersionUID = 1L;- private String value;+ private List<String> values;@Editable(name="Values", description="Specify values of the parameter, with each line representing a separate value")@OmitName- @NotEmpty- @Multiline- public String getValue() {- return value;+ @Size(min=1, message="At least one value needs to be specified")+ public List<String> getValues() {+ return values;}- public void setValue(String value) {- this.value = value;+ public void setValues(List<String> values) {+ this.values = values;}- public List<String> getValues() {- return Splitter.on("\n").trimResults().omitEmptyStrings().splitToList(value);- }-}diff --git a/core/src/main/java/io/onedev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.javaindex bc8ef758e6..aa9063abf9 100644--- a/core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/core/src/main/java/io/onedev/server/git/GitUtils.java@@ -451,7 +451,7 @@ public class GitUtils {@Nullablepublic static ObjectId merge(Repository repository, ObjectId source, ObjectId target,- boolean squash, PersonIdent committer, String commitMessage) {+ boolean squash, PersonIdent committer, PersonIdent author, String commitMessage) {try ( RevWalk revWalk = new RevWalk(repository);ObjectInserter inserter = repository.newObjectInserter();) {RevCommit sourceCommit = revWalk.parseCommit(source);@@ -459,7 +459,7 @@ public class GitUtils {Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);if (merger.merge(targetCommit, sourceCommit)) {CommitBuilder mergedCommit = new CommitBuilder();- mergedCommit.setAuthor(sourceCommit.getAuthorIdent());+ mergedCommit.setAuthor(author);mergedCommit.setCommitter(committer);if (squash)mergedCommit.setParentId(targetCommit);diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javaindex 87767126c2..8ecd921ef5 100644--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ b/core/src/main/java/io/onedev/server/model/Build2.java@@ -18,13 +18,8 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import org.eclipse.jgit.lib.ObjectId;-import com.fasterxml.jackson.annotation.JsonView;-import com.google.common.base.Preconditions;-import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.Job;import io.onedev.server.util.jackson.DefaultView;@Entity@@ -33,7 +28,7 @@ import io.onedev.server.util.jackson.DefaultView;@Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),@Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),@Index(columnList="runningDate"), @Index(columnList="finishDate"),- @Index(columnList="runInstanceId")},+ @Index(columnList="runningInstance")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})public class Build2 extends AbstractEntity {@@ -78,11 +73,9 @@ public class Build2 extends AbstractEntity {private Date finishDate;- private String runInstanceId;+ private String runningInstance;private String errorMessage;-- private transient Job job;@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)private Collection<BuildParam> params = new ArrayList<>();@@ -214,12 +207,12 @@ public class Build2 extends AbstractEntity {this.dependents = dependents;}- public String getRunInstanceId() {- return runInstanceId;+ public String getRunningInstance() {+ return runningInstance;}- public void setRunInstanceId(String runInstanceId) {- this.runInstanceId = runInstanceId;+ public void setRunningInstance(String runningInstance) {+ this.runningInstance = runningInstance;}public String getErrorMessage() {@@ -239,12 +232,4 @@ public class Build2 extends AbstractEntity {return paramMap;}- public Job getJob() {- if (job == null) {- CISpec ciSpec = Preconditions.checkNotNull(getProject().getCISpec(ObjectId.fromString(getCommitHash())));- job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName));- }- return job;- }-}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.javaindex a9049768c8..2d064b0456 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java@@ -1,20 +1,20 @@package io.onedev.server.model.support.jobexecutor;import java.io.Serializable;+import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.model.Build2;import io.onedev.server.web.editable.annotation.Editable;@Editablepublic interface JobExecutor extends Serializable {@Nullable- String run(Build2 build);+ String run(String image, List<String> commands);- boolean isRunning(Build2 build);+ boolean isRunning(String runningInstance);- void stop(Build2 build);+ void stop(String runningInstance);}diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.javanew file mode 100644index 0000000000..c80908b5f8--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalhostExecutor.java@@ -0,0 +1,26 @@+package io.onedev.server.model.support.jobexecutor;++import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable(order=100)+public class LocalhostExecutor implements JobExecutor {++ private static final long serialVersionUID = 1L;++ @Override+ public String run(String image, List<String> commands) {+ return null;+ }++ @Override+ public boolean isRunning(String runningInstance) {+ return false;+ }++ @Override+ public void stop(String runningInstance) {+ }++}\ No newline at end of filediff --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.javadeleted file mode 100644index 3bb80d53a5..0000000000--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java+++ /dev/null@@ -1,87 +0,0 @@-package io.onedev.server.model.support.jobexecutor;--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;--@Editable-public class SleepyJobExecutor implements JobExecutor {-- private static final long serialVersionUID = 1L;-- private static final int MAX_JOBS = 5;-- private static final Map<String, Thread> threads = new HashMap<>();-- @Override- public String run(Build2 build) {- synchronized (threads) {- if (threads.size() < MAX_JOBS) {- Long buildId = build.getId();- String runInstanceId = UUID.randomUUID().toString();- Thread thread = new Thread(new Runnable() {-- @Override- public void run() {- AtomicReference<Status> statusRef = new AtomicReference<>();- try {- Thread.sleep(10000);- statusRef.set(Status.SUCCESSFUL);- } catch (InterruptedException e) {- statusRef.set(Status.CANCELLED);- } finally {- synchronized (threads) {- threads.remove(runInstanceId);- }- OneDev.getInstance(TransactionManager.class).run(new Runnable() {-- @Override- public void run() {- Build2 build = OneDev.getInstance(Build2Manager.class).load(buildId);- build.setStatus(statusRef.get());- build.setFinishDate(new Date());- OneDev.getInstance(ListenerRegistry.class).post(new BuildFinished(build));- }-- });- }- }-- });- threads.put(runInstanceId, thread);- thread.start();- return runInstanceId;- } else {- return null;- }- }- }-- @Override- public boolean isRunning(Build2 build) {- synchronized (threads) {- return threads.containsKey(build.getRunInstanceId());- }- }-- @Override- public void stop(Build2 build) {- synchronized (threads) {- Thread thread = threads.get(build.getRunInstanceId());- if (thread != null)- thread.interrupt();- }- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex c6da3af8ec..70fceb91f7 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -20,7 +20,7 @@ public enum MergeStrategy {Repository repository = request.getTargetProject().getRepository();ObjectId requestHead = request.getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();- return GitUtils.merge(repository, requestHead, targetHead, false, user,+ return GitUtils.merge(repository, requestHead, targetHead, false, user, user,request.getCommitMessage());}@@ -36,7 +36,7 @@ public enum MergeStrategy {return requestHead;} else {PersonIdent user = new PersonIdent(OneDev.NAME, "");- return GitUtils.merge(repository, requestHead, targetHead, false, user,+ return GitUtils.merge(repository, requestHead, targetHead, false, user, user,request.getCommitMessage());}}@@ -50,7 +50,7 @@ public enum MergeStrategy {ObjectId requestHead = request.getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();PersonIdent user = new PersonIdent(OneDev.NAME, "");- return GitUtils.merge(repository, requestHead, targetHead, true, user,+ return GitUtils.merge(repository, requestHead, targetHead, true, user, user,request.getCommitMessage());}diff --git a/core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/core/src/test/java/io/onedev/server/git/GitUtilsTest.javaindex 0505e0b34e..8167a4b9ff 100644--- a/core/src/test/java/io/onedev/server/git/GitUtilsTest.java+++ b/core/src/test/java/io/onedev/server/git/GitUtilsTest.java@@ -119,7 +119,7 @@ public class GitUtilsTest extends AbstractGitTest {addFileAndCommit("master2", "", "master2");ObjectId masterId = git.getRepository().resolve("master");ObjectId devId = git.getRepository().resolve("dev");- ObjectId mergeCommitId = GitUtils.merge(git.getRepository(), devId, masterId, false, user, "merge commit");+ ObjectId mergeCommitId = GitUtils.merge(git.getRepository(), devId, masterId, false, user, user, "merge commit");try ( RevWalk revWalk = new RevWalk(git.getRepository());TreeWalk treeWalk = new TreeWalk(git.getRepository())) {RevCommit mergeCommit = revWalk.parseCommit(mergeCommitId);@@ -145,7 +145,7 @@ public class GitUtilsTest extends AbstractGitTest {addFileAndCommit("master1", "", "master1");addFileAndCommit("conflict", "2", "master2");assertNull(GitUtils.merge(git.getRepository(), git.getRepository().resolve("dev"),- git.getRepository().resolve("master"), false, user, "merge commit"));+ git.getRepository().resolve("master"), false, user, user, "merge commit"));}}