github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fixed deadlock on exception being thrown.

Browse source
This commit is contained in:
Winston Li 2014-11-20 10:54:16 +00:00
parent b847e6f712
commit 2c64fb0e4f
2 changed files with 65 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/ProjectLock.java Normal file
View file

@ -0,0 +1,38 @@
package uk.ac.ic.wlgitbridge.writelatex;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
* Created by Winston on 20/11/14.
*/
public class ProjectLock {
private final Map<String, Lock> projectLocks;
public ProjectLock() {
projectLocks = new HashMap<String, Lock>();
}
public void lockForProject(String projectName) {
System.out.println("Locking for: " + Thread.currentThread().getId());
getLockForProjectName(projectName).lock();
}
public void unlockForProject(String projectName) {
System.out.println("Unlocking for: " + Thread.currentThread().getId());
getLockForProjectName(projectName).unlock();
}
private synchronized Lock getLockForProjectName(String projectName) {
Lock lock = projectLocks.get(projectName);
if (lock == null) {
lock = new ReentrantLock();
projectLocks.put(projectName, lock);
}
return lock;
}
}

37
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
View file

@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
* Created by Winston on 16/11/14.
@ -30,34 +29,24 @@ public class WriteLatexAPI implements WriteLatexDataSource {
private final WLDataModel dataModel;
private final PostbackManager postbackManager;
private final Map<String, Lock> projectLocks;
private final Lock projectLocksLock;
private final ProjectLock mainProjectLock;
public WriteLatexAPI(WLDataModel dataModel) {
this.dataModel = dataModel;
postbackManager = new PostbackManager();
projectLocks = new HashMap<String, Lock>();
projectLocksLock = new ReentrantLock();
}
private Lock getLockForProjectName(String projectName) {
projectLocksLock.lock();
Lock lock = projectLocks.get(projectName);
if (lock == null) {
lock = new ReentrantLock();
projectLocks.put(projectName, lock);
}
projectLocksLock.unlock();
return lock;
mainProjectLock = new ProjectLock();
// postbackLock = new ProjectLock();
}
@Override
public void lockForProject(String projectName) {
getLockForProjectName(projectName).lock();
mainProjectLock.lockForProject(projectName);
}
@Override
public void unlockForProject(String projectName) {
getLockForProjectName(projectName).unlock();
mainProjectLock.unlockForProject(projectName);
}
@Override
@ -69,6 +58,8 @@ public class WriteLatexAPI implements WriteLatexDataSource {
snapshotGetDocRequest.getResult().getVersionID();
} catch (InvalidProjectException e) {
return false;
} catch (FailedConnectionException e) {
throw e;
} finally {
unlockForProject(projectName);
}
@ -84,7 +75,8 @@ public class WriteLatexAPI implements WriteLatexDataSource {
@Override
public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String hostname) throws SnapshotPostException, IOException, FailedConnectionException {
lockForProject(projectName);
mainProjectLock.lockForProject(projectName);
try {
System.out.println("Pushing project: " + projectName);
CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents, hostname);
SnapshotPushRequest snapshotPushRequest = new SnapshotPushRequest(candidate);
@ -92,11 +84,18 @@ public class WriteLatexAPI implements WriteLatexDataSource {
SnapshotPushRequestResult result = snapshotPushRequest.getResult();
if (result.wasSuccessful()) {
candidate.approveWithVersionID(postbackManager.getVersionID(projectName));
unlockForProject(projectName);
} else {
unlockForProject(projectName);
throw new OutOfDateException();
}
} catch (SnapshotPostException e) {
throw e;
} catch (IOException e) {
throw e;
} catch (FailedConnectionException e) {
throw e;
} finally {
mainProjectLock.unlockForProject(projectName);
}
}
/* Called by postback thread. */