Merge pull request #43 from mathieucarbou/stats

Avoid loosing ehcache stats when 1 tier and also fix library loading
Terracotta-OSS · Jul 16, 2018 · 0ceda5d · 0ceda5d
2 parents 727d1e2 + 7fa6189
commit 0ceda5d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 19 deletions.
diff --git a/src/main/java/org/terracotta/tinypounder/CacheManagerBusinessReflectionImpl.java b/src/main/java/org/terracotta/tinypounder/CacheManagerBusinessReflectionImpl.java
@@ -373,6 +373,16 @@ private Object defaultCacheConfigurationHeapOffHeapDedicatedClustered(CacheConfi
     Method newCacheConfigurationBuilderMethod = cacheConfigurationBuilderClass.getMethod("newCacheConfigurationBuilder", Class.class, Class.class, builderClass);
     Object resourcePoolsBuilder = defaultCacheConfigurationCacheResourcePoolBuilder(kitAwareClassLoaderDelegator.isEEKit(), cacheConfiguration);
     Object cacheConfigurationBuilder = newCacheConfigurationBuilderMethod.invoke(null, Long.class, String.class, resourcePoolsBuilder);
+
+    try {
+      Class<?> storeStatisticsConfigurationClass = loadClass("org.ehcache.core.config.store.StoreStatisticsConfiguration");
+      Object storeStatisticsConfiguration = storeStatisticsConfigurationClass.getConstructor(boolean.class).newInstance(true);
+      Method add = cacheConfigurationBuilderClass.getMethod("add", loadClass("org.ehcache.spi.service.ServiceConfiguration"));
+      add.invoke(cacheConfigurationBuilder, storeStatisticsConfiguration);
+    } catch (Exception e) {
+      System.out.println("Unable to call: add(new StoreStatisticsConfiguration(true))");
+    }
+
     Method buildMethod = cacheConfigurationBuilderClass.getMethod("build");
     return buildMethod.invoke(cacheConfigurationBuilder);
   }

diff --git a/src/main/java/org/terracotta/tinypounder/KitAwareClassLoaderDelegator.java b/src/main/java/org/terracotta/tinypounder/KitAwareClassLoaderDelegator.java
@@ -19,6 +19,8 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.xml.bind.DatatypeConverter;
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -27,7 +29,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.stream.Stream;
+import java.security.MessageDigest;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Service
 public class KitAwareClassLoaderDelegator {
@@ -55,41 +59,54 @@ public ClassLoader getUrlClassLoader() {
   }
 
   private static URL[] discoverKitClientJars(String kitPath) throws Exception {
-    Stream<Path> clientEhcacheJarStream = null;
+    // this map helps avoiding errors like this one by avoiding putting duplicated jars in classpath:
+    // MULTIPLE instances of org.terracotta.lease.LeaseAcquirerClientService found, ignoring:file:/Users/mathieu/Downloads/terracotta-db-10.3.0-SNAPSHOT/client/lib/terracotta-common-client-10.3.0-SNAPSHOT.jar keeping:file:/Users/mathieu/Downloads/terracotta-db-10.3.0-SNAPSHOT/client/ehcache/terracotta-ehcache-client-10.3.0-SNAPSHOT.jar using classloader:java.net.FactoryURLClassLoader@6505414e
+    Map<String, File> libraries = new LinkedHashMap<>();
     try {
-      clientEhcacheJarStream = Files.walk(Paths.get(kitPath, "/client/ehcache"), 4, FileVisitOption.FOLLOW_LINKS)
-          .filter(path -> path.toFile().getAbsolutePath().endsWith("jar"));
-    } catch (IOException e) {
+      Files.walk(Paths.get(kitPath, "/client/ehcache"), 4, FileVisitOption.FOLLOW_LINKS)
+          .map(Path::toFile)
+          .filter(file -> file.getName().endsWith(".jar"))
+          .forEach(file -> libraries.put(hash(file), file.getAbsoluteFile()));
+    } catch (Exception e) {
       // that's fine, it's probably just a kit without ehcache
     }
-    Stream<Path> clientStoreJarStream = null;
     try {
-      clientStoreJarStream = Files.walk(Paths.get(kitPath, "/client/store"), 4, FileVisitOption.FOLLOW_LINKS)
-          .filter(path -> path.toFile().getAbsolutePath().endsWith("jar"));
+      Files.walk(Paths.get(kitPath, "/client/store"), 4, FileVisitOption.FOLLOW_LINKS)
+          .map(Path::toFile)
+          .filter(file -> file.getName().endsWith(".jar"))
+          .forEach(file -> libraries.put(hash(file), file.getAbsoluteFile()));
     } catch (IOException e) {
       // that's fine, it's probably just a kit without tc store
     }
-    Stream<Path> clientLibJarStream = Stream.empty();
     try {
-      clientLibJarStream = Files.walk(Paths.get(kitPath, "/client/lib"), 4, FileVisitOption.FOLLOW_LINKS)
-          .filter(path -> path.toFile().getAbsolutePath().endsWith("jar"));
+      Files.walk(Paths.get(kitPath, "/client/lib"), 4, FileVisitOption.FOLLOW_LINKS)
+          .map(Path::toFile)
+          .filter(file -> file.getName().endsWith(".jar"))
+          .forEach(file -> libraries.put(hash(file), file.getAbsoluteFile()));
     } catch (IOException e) {
       // it's possible that the client libs are elsewhere...
-      clientLibJarStream = Files.walk(Paths.get(kitPath, "../common/lib"), 4, FileVisitOption.FOLLOW_LINKS)
-          .filter(path -> path.toFile().getAbsolutePath().endsWith("-client.jar"));
+      Files.walk(Paths.get(kitPath, "../common/lib"), 4, FileVisitOption.FOLLOW_LINKS)
+          .map(Path::toFile)
+          .filter(file -> file.getName().endsWith("-client.jar"))
+          .forEach(file -> libraries.put(hash(file), file.getAbsoluteFile()));
     }
-    Stream<Path> concat = clientEhcacheJarStream != null ? Stream.concat(clientEhcacheJarStream, clientLibJarStream) : clientLibJarStream;
-    concat = clientStoreJarStream != null ? Stream.concat(concat, clientStoreJarStream) : concat;
-    return concat.map(path -> {
+    return libraries.values().stream().map(file -> {
       try {
-        return new URL("file:" + path.toFile().getAbsolutePath());
+        return file.toURI().toURL();
       } catch (MalformedURLException e) {
-        e.printStackTrace();
+        throw new AssertionError(e);
       }
-      return null;
     }).toArray(URL[]::new);
   }
 
+  private static String hash(File file) {
+    try {
+      return DatatypeConverter.printHexBinary(MessageDigest.getInstance("MD5").digest(Files.readAllBytes(file.toPath())));
+    } catch (Exception e) {
+      return file.getName();
+    }
+  }
+
   public boolean containsTerracottaStore() {
     try {
       urlClassLoader.loadClass("com.terracottatech.store.manager.DatasetManager");