Update module 'chimera' to use Caffeine.

Signed-off-by: Lukas Mansour <lukas.mansour@desy.de>

Author: LukasMansour

modules/chimera/pom.xml

@@ -26,6 +26,10 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>

modules/chimera/src/main/java/org/dcache/chimera/JdbcFs.java

@@ -26,11 +26,11 @@
 import static org.dcache.util.ByteUnit.EiB;
 import static org.dcache.util.SqlHelper.tryToClose;
 
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Throwables;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import com.google.common.io.ByteSource;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import diskCacheV111.util.RetentionPolicy;
@@ -45,7 +45,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -127,30 +128,23 @@ public class JdbcFs implements FileSystemProvider, LeaderLatchListener {
                       .build()
           );
 
-    private final LoadingCache<Object, FsStat> _fsStatCache
-          = CacheBuilder.newBuilder()
+    private final AsyncLoadingCache<Object, FsStat> _fsStatCache
+          = Caffeine.newBuilder()
           .refreshAfterWrite(100, TimeUnit.MILLISECONDS)
-          .build(
-                CacheLoader.asyncReloading(new CacheLoader<Object, FsStat>() {
-
-                                               @Override
-                                               public FsStat load(Object k) throws Exception {
-                                                   return JdbcFs.this.getFsStat0();
-                                               }
-                                           }
-                      , _fsStatUpdateExecutor));
+          .executor(_fsStatUpdateExecutor)
+          .buildAsync(key -> JdbcFs.this.getFsStat0());
 
     /* The PNFS ID to inode number mapping will never change while dCache is running.
      */
     protected final Cache<String, Long> _inoCache =
-          CacheBuilder.newBuilder()
+          Caffeine.newBuilder()
                 .maximumSize(100000)
                 .build();
 
     /* The inode number to PNFS ID mapping will never change while dCache is running.
      */
     protected final Cache<Long, String> _idCache =
-          CacheBuilder.newBuilder()
+          Caffeine.newBuilder()
                 .maximumSize(100000)
                 .build();
 
@@ -725,36 +719,40 @@ public FsInode path2inode(String path, FsInode startFrom) throws ChimeraFsExcept
     @Override
     public String inode2id(FsInode inode) throws ChimeraFsException {
         try {
-            return _idCache.get(inode.ino(), () -> {
+            return _idCache.get(inode.ino(), (key) -> {
                 String id = _sqlDriver.getId(inode);
                 if (id == null) {
-                    throw FileNotFoundChimeraFsException.of(inode);
+                    throw new RuntimeException(FileNotFoundChimeraFsException.of(inode));
                 }
                 return id;
             });
-        } catch (ExecutionException e) {
-            Throwables.throwIfInstanceOf(e.getCause(), ChimeraFsException.class);
-            Throwables.throwIfInstanceOf(e.getCause(), DataAccessException.class);
-            Throwables.throwIfUnchecked(e.getCause());
-            throw new RuntimeException(e.getCause());
+        } catch (RuntimeException e) {
+            if (e.getCause() != null) {
+                Throwables.throwIfInstanceOf(e.getCause(), ChimeraFsException.class);
+                Throwables.throwIfInstanceOf(e.getCause(), DataAccessException.class);
+                Throwables.throwIfUnchecked(e.getCause());
+            }
+            throw e;
         }
     }
 
     @Override
     public FsInode id2inode(String id, StatCacheOption option) throws ChimeraFsException {
         if (option == NO_STAT) {
             try {
-                return new FsInode(this, _inoCache.get(id, () -> {
+                return new FsInode(this, _inoCache.get(id, (key) -> {
                     Long ino = _sqlDriver.getInumber(id);
                     if (ino == null) {
-                        throw FileNotFoundChimeraFsException.ofPnfsId(id);
+                        throw new RuntimeException(FileNotFoundChimeraFsException.ofPnfsId(id));
                     }
                     return ino;
                 }));
-            } catch (ExecutionException e) {
-                Throwables.throwIfInstanceOf(e.getCause(), ChimeraFsException.class);
-                Throwables.throwIfInstanceOf(e.getCause(), DataAccessException.class);
-                Throwables.throwIfUnchecked(e.getCause());
+            } catch (RuntimeException e) {
+                if (e.getCause() != null) {
+                    Throwables.throwIfInstanceOf(e.getCause(), ChimeraFsException.class);
+                    Throwables.throwIfInstanceOf(e.getCause(), DataAccessException.class);
+                    Throwables.throwIfUnchecked(e.getCause());
+                }
                 throw new RuntimeException(e.getCause());
             }
         } else {
@@ -1403,19 +1401,19 @@ private static void checkNameLength(String name) throws InvalidNameChimeraExcept
     }
 
     @Override
-    public void updateFsStat() throws ChimeraFsException {
+    public void updateFsStat() {
         _sqlDriver.updateFsStat();
     }
 
-    public FsStat getFsStat0() throws ChimeraFsException {
+    public FsStat getFsStat0() {
         return _sqlDriver.getFsStat();
     }
 
     @Override
     public FsStat getFsStat() throws ChimeraFsException {
         try {
-            return _fsStatCache.get(DUMMY_KEY);
-        } catch (ExecutionException e) {
+            return _fsStatCache.synchronous().get(DUMMY_KEY);
+        } catch (CompletionException e) {
             Throwable t = e.getCause();
             Throwables.propagateIfPossible(t, ChimeraFsException.class);
             throw new ChimeraFsException(t.getMessage(), t);