Просмотр исходного кода

Merge pull request #63 from overleaf/sk-emergency-log-and-trap-gc-errors

Log and trap/ignore gc errors during swap
Shane Kilkelly 7 лет назад
Родитель
Сommit
8086a1b2b4

+ 5 - 1
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java

@@ -162,7 +162,11 @@ public class SwapJobImpl implements SwapJob {
         Preconditions.checkNotNull(projName, "projName was null");
         Log.info("Evicting project: {}", projName);
         try (LockGuard __ = lock.lockGuard(projName)) {
-            repoStore.gcProject(projName);
+            try {
+                repoStore.gcProject(projName);
+            } catch (Exception e) {
+                Log.error("[{}] Exception while running gc on project: {}", projName, e);
+            }
             long[] sizePtr = new long[1];
             try (InputStream blob = repoStore.bzip2Project(projName, sizePtr)) {
                 swapStore.upload(projName, blob, sizePtr[0]);