Merge pull request #1820 from UNC-Libraries/bxc-4541

BXC-4541 - Tuning of cantaloupe cache invalidation

Author: sharonluong

services-camel-app/src/main/java/edu/unc/lib/boxc/services/camel/images/ImageEnhancementsRouter.java

@@ -21,6 +21,9 @@
 public class ImageEnhancementsRouter extends RouteBuilder {
     private static final Logger log = getLogger(ImageEnhancementsRouter.class);
 
+    private static final int CACHE_INVALIDATE_THREADS = 5;
+    private static final int CACHE_INVALIDATE_REQUESTS_PER_SEC = 10;
+
     @BeanInject(value = "addAccessCopyProcessor")
     private AddDerivativeProcessor addAccessCopyProcessor;
 
@@ -59,7 +62,12 @@ public void configure() throws Exception {
                     .recipientList(simple("exec:/bin/sh?args=${properties:cdr.enhancement.bin}/convertJp2.sh "
                             + "${headers[CdrImagePath]} ${headers[CdrMimeType]} ${headers[CdrTempPath]}"))
                     .bean(addAccessCopyProcessor)
-                    .bean(imageCacheInvalidationProcessor)
+                    // Process cache invalidation asynchronously with a limited number of threads
+                    .threads(CACHE_INVALIDATE_THREADS)
+                        // Limit the max number of requests per second
+                        .throttle(CACHE_INVALIDATE_REQUESTS_PER_SEC)
+                        .bean(imageCacheInvalidationProcessor)
+                    .end()
                 .endDoTry()
                 .doFinally()
                     .bean(addAccessCopyProcessor, "cleanupTempFile")

services-camel-app/src/main/webapp/WEB-INF/service-context.xml

@@ -98,6 +98,8 @@
     <!-- ACL related beans -->
     <bean id="httpClientConnectionManager" class="org.apache.http.impl.conn.PoolingHttpClientConnectionManager"
             destroy-method="shutdown">
+        <property name="maxTotal" value="100" />
+        <property name="defaultMaxPerRoute" value="5"/>
     </bean>
 
     <bean id="sparqlQueryService" class="edu.unc.lib.boxc.model.fcrepo.sparql.FusekiSparqlQueryServiceImpl">