opendev/gerrit
Code Issues Proposed changes

Revert "Reduce chance of deadlock in account cache"

Browse Source 
This reverts commit 00fc15ac00.

With Caffeine, accessing the cache from the cache loader is causing an
infinite loop [1]. On stable-2.14, the only circular dependency was removed
but it looks like there is another one on stable-2.15. Revert the change
until circular dependency is removed or a solution is found to access
the cache from the cache loader.

The test going into an infinite loop is
RevisionDiffIT.rebaseHunksOneLineApartFromRegularHunkAreIdentified.

[1]https://github.com/ben-manes/caffeine/issues/89

Bug: Issue 8464
Change-Id: If65560b4a9bfcf0a03decaedd83ad000c6b28f4f
This commit is contained in:
Hugo Arès
2018-02-27 19:05:41 -05:00
parent 5562453950
commit c6facdb695
6 changed files with 33 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WORKSPACE
View File

@@ -212,18 +212,6 @@ maven_jar(
sha1 = GUAVA_BIN_SHA1,
)
maven_jar(
name = "caffeine",
artifact = "com.github.ben-manes.caffeine:caffeine:2.6.1",
sha1 = "fc7a29feda0a3c5aaf1ff55e0df5417025e6d5f4",
)
maven_jar(
name = "caffeine_guava",
artifact = "com.github.ben-manes.caffeine:guava:2.6.1",
sha1 = "e1fbe0d8c06639d6fee74404f687f00da25671eb",
)
maven_jar(
name = "velocity",
artifact = "org.apache.velocity:velocity:1.7",