Skip to content

The Unified and Autonomous Development Platform

fix issue #74: Possible deadlock when use embedded hsql database

Robin Shen7a081337f25d
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 4ab1876439..8c3f6141be 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -58,14 +58,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
* merge preview, or <tt>null</tt> if preview is being calculating
*/
MergePreview previewMerge(PullRequest request);
-
- /**
- * Delete git refs of this pull request and all its updates.
- *
- * @param request
- * pull request whose git refs and update refs to be deleted
- */
- void deleteRefs(PullRequest request);
void open(PullRequest request);
@@ -80,8 +72,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
int countOpen(Project targetProject);
- void checkUpdate(PullRequest request);
-
void checkQuality(PullRequest request);
List<PullRequest> query(@Nullable Project targetProject,
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
index b6a77ea2b7..d447f8132f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java
@@ -5,19 +5,13 @@ import java.util.List;
import javax.annotation.Nullable;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdate> {
- /**
- * @param update
- * update to be saved
- * @param independent
- * whether or not this update is an independent update. An independent update is
- * not created as result of other actions such as open and merge
- */
- void save(PullRequestUpdate update, boolean independent);
+ void checkUpdate(PullRequest request);
List<PullRequestUpdate> queryAfter(Project project, @Nullable Long afterUpdateId, int count);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 2a2bebc6ed..8a156e5777 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -203,17 +203,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Override
public void delete(PullRequest request) {
- deleteRefs(request);
- dao.remove(request);
- }
-
- @Sessional
- @Override
- public void deleteRefs(PullRequest request) {
- for (PullRequestUpdate update : request.getUpdates())
- update.deleteRefs();
-
request.deleteRefs();
+ for (PullRequestUpdate update: request.getUpdates())
+ update.deleteRefs();
+ dao.remove(request);
}
@Transactional
@@ -320,9 +313,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),
preview.getMergeStrategy(), merged);
request.setLastMergePreview(preview);
- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), request.getMergeRef());
- refUpdate.setNewObjectId(mergedId);
- GitUtils.updateRef(refUpdate);
+ request.writeMergeRef();
}
closeAsMerged(request, false);
@@ -371,17 +362,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
request.setLastUpdate(event.getLastUpdate());
dao.persist(request);
-
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());
- refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));
- GitUtils.updateRef(refUpdate);
-
- refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getHeadRef());
- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));
- GitUtils.updateRef(refUpdate);
+ request.writeBaseRef();
+ request.writeHeadRef();
for (PullRequestUpdate update: request.getUpdates())
- pullRequestUpdateManager.save(update, false);
+ pullRequestUpdateManager.save(update);
pullRequestReviewManager.saveReviews(request);
pullRequestBuildManager.savePullRequestBuilds(request);
@@ -402,9 +387,11 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
closeInfo.setStatus(CloseInfo.Status.MERGED);
request.setCloseInfo(closeInfo);
- String reason = null;
+ String reason;
if (dueToMerged)
reason = "closed pull request as source branch is merged into target branch";
+ else
+ reason = null;
PullRequestChange change = new PullRequestChange();
change.setUser(userManager.getSystem());
@@ -414,28 +401,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
pullRequestChangeManager.save(change);
}
- @Override
- public void checkUpdate(PullRequest request) {
- if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {
- ObjectId mergeBase = GitUtils.getMergeBase(
- request.getTargetProject().getRepository(), request.getTarget().getObjectId(),
- request.getSourceProject().getRepository(), request.getSource().getObjectId());
- if (mergeBase != null) {
- PullRequestUpdate update = new PullRequestUpdate();
- update.setRequest(request);
- update.setHeadCommitHash(request.getSource().getObjectName());
- update.setMergeBaseCommitHash(mergeBase.name());
- request.addUpdate(update);
- pullRequestUpdateManager.save(update, true);
-
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
- request.getHeadRef());
- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));
- GitUtils.updateRef(refUpdate);
- }
- }
- }
-
@Transactional
@Override
public void check(PullRequest request) {
@@ -449,7 +414,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
} else if (request.getTarget().getObjectId(false) == null) {
discard(request, "Target branch no longer exists");
} else {
- checkUpdate(request);
+ pullRequestUpdateManager.checkUpdate(request);
if (request.isMergeIntoTarget()) {
closeAsMerged(request, true);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index d0ef425484..fb6dd43a34 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -6,15 +6,11 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.transport.RefSpec;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
import io.onedev.server.git.GitUtils;
@@ -33,62 +29,45 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR
private final ListenerRegistry listenerRegistry;
- private final PullRequestManager pullRequestManager;
-
@Inject
public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
- PullRequestCommentManager commentManager, PullRequestManager pullRequestManager) {
+ PullRequestCommentManager commentManager) {
super(dao);
this.listenerRegistry = listenerRegistry;
- this.pullRequestManager = pullRequestManager;
}
@Transactional
@Override
public void save(PullRequestUpdate update) {
- save(update, true);
+ super.save(update);
+ update.writeRef();
}
-
+
@Transactional
@Override
- public void save(PullRequestUpdate update, boolean independent) {
- PullRequest request = update.getRequest();
-
- dao.persist(update);
-
- ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());
- if (!request.getTargetProject().equals(request.getSourceProject())) {
- try {
- request.getTargetProject().git().fetch()
- .setRemote(request.getSourceProject().getGitDir().getAbsolutePath())
- .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef()))
- .call();
- if (!request.getTargetProject().getObjectId(update.getHeadRef(), true).equals(updateHeadId)) {
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
- update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
+ public void checkUpdate(PullRequest request) {
+ if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {
+ ObjectId mergeBase = GitUtils.getMergeBase(
+ request.getTargetProject().getRepository(), request.getTarget().getObjectId(),
+ request.getSourceProject().getRepository(), request.getSource().getObjectId());
+ if (mergeBase != null) {
+ request.setHeadCommitHash(request.getSource().getObjectName());
+ request.writeHeadRef();
+
+ PullRequestUpdate update = new PullRequestUpdate();
+ update.setRequest(request);
+ update.setHeadCommitHash(request.getHeadCommitHash());
+ update.setMergeBaseCommitHash(mergeBase.name());
+ request.addUpdate(update);
+
+ save(update);
+
+ listenerRegistry.post(new PullRequestUpdated(update));
}
- } else {
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
- update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
-
- request.setHeadCommitHash(update.getHeadCommitHash());
- pullRequestManager.save(request);
-
- if (independent) {
- PullRequestUpdated event = new PullRequestUpdated(update);
- listenerRegistry.post(event);
}
}
-
+
@Sessional
@Override
public List<PullRequestUpdate> queryAfter(Project project, Long afterUpdateId, int count) {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 7e7b7263af..51c99a09d8 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -313,6 +313,8 @@ public class Project extends AbstractEntity {
private transient Optional<CommitQuerySetting> commitQuerySettingOfCurrentUserHolder;
+ private transient Optional<RevCommit> lastCommitHolder;
+
private transient List<Milestone> sortedMilestones;
private transient List<String> jobNames;
@@ -724,6 +726,29 @@ public class Project extends AbstractEntity {
return jobNames;
}
+ public RevCommit getLastCommit() {
+ if (lastCommitHolder == null) {
+ RevCommit lastCommit = null;
+ try {
+ for (Ref ref: getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS)) {
+ RevCommit commit = getRevCommit(ref.getObjectId(), false);
+ if (commit != null) {
+ if (lastCommit != null) {
+ if (commit.getCommitTime() > lastCommit.getCommitTime())
+ lastCommit = commit;
+ } else {
+ lastCommit = commit;
+ }
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ lastCommitHolder = Optional.fromNullable(lastCommit);
+ }
+ return lastCommitHolder.orNull();
+ }
+
public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {
if (path == null)
path = "";
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index f6e6d0b720..237c554301 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -1,5 +1,12 @@
package io.onedev.server.model;
+import static io.onedev.server.model.PullRequest.PROP_HEAD_COMMIT_HASH;
+import static io.onedev.server.model.PullRequest.PROP_NO_SPACE_TITLE;
+import static io.onedev.server.model.PullRequest.PROP_NUMBER;
+import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;
+import static io.onedev.server.model.PullRequest.PROP_TITLE;
+import static io.onedev.server.model.PullRequest.PROP_UUID;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -30,6 +37,7 @@ import javax.persistence.UniqueConstraint;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -62,7 +70,6 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.SecurityUtils;
-import static io.onedev.server.model.PullRequest.*;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.jackson.RestView;
@@ -619,6 +626,24 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
GitUtils.deleteRef(GitUtils.getRefUpdate(getTargetProject().getRepository(), getHeadRef()));
}
+ public void writeBaseRef() {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(getTargetProject().getRepository(), getBaseRef());
+ refUpdate.setNewObjectId(ObjectId.fromString(getBaseCommitHash()));
+ GitUtils.updateRef(refUpdate);
+ }
+
+ public void writeHeadRef() {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(getTargetProject().getRepository(), getHeadRef());
+ refUpdate.setNewObjectId(ObjectId.fromString(getHeadCommitHash()));
+ GitUtils.updateRef(refUpdate);
+ }
+
+ public void writeMergeRef() {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(getTargetProject().getRepository(), getMergeRef());
+ refUpdate.setNewObjectId(ObjectId.fromString(getLastMergePreview().getMerged()));
+ GitUtils.updateRef(refUpdate);
+ }
+
public static class CriterionHelper {
public static Criterion ofOpen() {
return Restrictions.isNull("closeInfo");
@@ -999,7 +1024,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public Project getAttachmentProject() {
return getTargetProject();
}
-
+
public ProjectScopedNumber getFQN() {
return new ProjectScopedNumber(getTargetProject(), getNumber());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
index df883e76bd..c4430ea53a 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java
@@ -19,10 +19,12 @@ import javax.persistence.Table;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.RevFilter;
+import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.hibernate.annotations.Cache;
@@ -31,6 +33,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
+import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentRelationManager;
import io.onedev.server.git.GitUtils;
@@ -241,4 +244,27 @@ public class PullRequestUpdate extends AbstractEntity {
return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);
}
+ public void writeRef() {
+ ObjectId updateHeadId = ObjectId.fromString(getHeadCommitHash());
+ if (!request.getTargetProject().equals(request.getSourceProject())) {
+ try {
+ request.getTargetProject().git().fetch()
+ .setRemote(request.getSourceProject().getGitDir().getAbsolutePath())
+ .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + getHeadRef()))
+ .call();
+ if (!request.getTargetProject().getObjectId(getHeadRef(), true).equals(updateHeadId)) {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ } else {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
index 5212e816a9..2757a7d37b 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -156,6 +157,10 @@ public class DefaultPersistManager implements PersistManager {
@Override
public void start() {
+ String dialect = getDialect().toLowerCase();
+ if (dialect.contains("hsql"))
+ execute(Lists.newArrayList("SET DATABASE TRANSACTION CONTROL MVCC"), true);
+
String dbDataVersion = checkDataVersion(true);
Metadata metadata = buildMetadata();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 340202fd3c..d8a5a1ec34 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -64,6 +64,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.BlobContent;
import io.onedev.server.git.BlobEdits;
@@ -1232,7 +1233,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
*/
PullRequest request = getPullRequest();
if (request != null)
- OneDev.getInstance(PullRequestManager.class).checkUpdate(request);
+ OneDev.getInstance(PullRequestUpdateManager.class).checkUpdate(request);
OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {
diff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.properties
index 3f566a5696..4282ff7bc3 100644
--- a/server-product/system/conf/hibernate.properties
+++ b/server-product/system/conf/hibernate.properties
@@ -5,7 +5,7 @@
hibernate.dialect=org.hibernate.dialect.HSQLDialect
hibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver
-hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/onedev;shutdown=true
+hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/onedev;hsqldb.tx=mvcc;shutdown=true
hibernate.connection.username=sa
hibernate.connection.password=