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

Merge pull request #12882 from overleaf/em-git-bridge-swap-job-config

Browse source 
Disable swap job when swap store is unsafe

GitOrigin-RevId: 104b03e378e7802f9ba6ff96b5a626a2fa7960fb
This commit is contained in:
Eric Mc Sween 2023-05-02 11:16:10 -04:00 committed by Copybot
parent da916c9c13
commit cc604376c5
6 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJob.java
View file

@ -4,6 +4,7 @@ import uk.ac.ic.wlgitbridge.bridge.db.DBStore;
import uk.ac.ic.wlgitbridge.bridge.lock.ProjectLock;
import uk.ac.ic.wlgitbridge.bridge.repo.RepoStore;
import uk.ac.ic.wlgitbridge.bridge.swap.store.SwapStore;
import uk.ac.ic.wlgitbridge.util.Log;
import java.io.IOException;
import java.util.Optional;
@ -60,16 +61,20 @@ public interface SwapJob {
DBStore dbStore,
SwapStore swapStore
) {
if (cfg.isPresent()) {
return new SwapJobImpl(
cfg.get(),
lock,
repoStore,
dbStore,
swapStore
);
if (!cfg.isPresent()) {
return new NoopSwapJob();
}
return new NoopSwapJob();
if (!swapStore.isSafe()) {
Log.warn("Swap store '{}' is not safe; disabling swap job", swapStore.getClass().getSimpleName());
return new NoopSwapJob();
}
return new SwapJobImpl(
cfg.get(),
lock,
repoStore,
dbStore,
swapStore
);
}
/**

4
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/store/InMemorySwapStore.java
View file

@ -51,4 +51,8 @@ public class InMemorySwapStore implements SwapStore {
store.remove(projectName);
}
@Override
public boolean isSafe() {
return false;
}
}

4
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/store/NoopSwapStore.java
View file

@ -25,4 +25,8 @@ public class NoopSwapStore implements SwapStore {
@Override
public void remove(String projectName) {}
@Override
public boolean isSafe() {
return false;
}
}

4
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/store/S3SwapStore.java
View file

@ -83,4 +83,8 @@ public class S3SwapStore implements SwapStore {
s3.deleteObject(del);
}
@Override
public boolean isSafe() {
return true;
}
}

7
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/store/SwapStore.java
View file

@ -41,4 +41,11 @@ public interface SwapStore {
void remove(String projectName);
/**
* Returns true if the swap store safely persists swapped projects.
*
* Fake swap stores should return false.
*/
boolean isSafe();
}

6
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
View file

@ -21,6 +21,7 @@ import org.asynchttpclient.*;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@ -657,6 +658,11 @@ public class WLGitBridgeIntegrationTest {
}
// We skip this test because it now hangs. It relies on the in-memory swap
// job, but we disable the swap job when the noop or in-memory swap store
// are configured. We do that for safety. Such a configuration in a
// production environment would lead to data loss.
@Ignore
@Test
public void wlgbCanSwapProjects(
) throws IOException, GitAPIException, InterruptedException {