You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/01/23 02:33:17 UTC

svn commit: r1560567 - in /sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor: HealthCheckExecutorImpl.java HealthCheckFuture.java HealthCheckResultCache.java

Author: cziegeler
Date: Thu Jan 23 01:33:16 2014
New Revision: 1560567

URL: http://svn.apache.org/r1560567
Log:
SLING-3321 : Incorrect caching behaviour

Modified:
    sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
    sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
    sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckResultCache.java

Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java?rev=1560567&r1=1560566&r2=1560567&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java Thu Jan 23 01:33:16 2014
@@ -100,7 +100,7 @@ public class HealthCheckExecutorImpl imp
 
     private final HealthCheckResultCache healthCheckResultCache = new HealthCheckResultCache();
 
-    private Map<HealthCheckMetadata, HealthCheckFuture> stillRunningFutures = new ConcurrentHashMap<HealthCheckMetadata, HealthCheckFuture>();
+    private final Map<HealthCheckMetadata, HealthCheckFuture> stillRunningFutures = new ConcurrentHashMap<HealthCheckMetadata, HealthCheckFuture>();
 
     @Reference
     private ThreadPoolManager threadPoolManager;
@@ -232,8 +232,6 @@ public class HealthCheckExecutorImpl imp
         // wait for futures at most until timeout (but will return earlier if all futures are finished)
         waitForFuturesRespectingTimeout(futures);
         collectResultsFromFutures(futures, results);
-
-        healthCheckResultCache.updateWith(results);
     }
 
     private HealthCheckExecutionResult createResultsForDescriptor(final HealthCheckMetadata metadata) {
@@ -250,17 +248,15 @@ public class HealthCheckExecutorImpl imp
             final HealthCheckFuture future = createOrReuseFuture(metadata);
 
             // wait for futures at most until timeout (but will return earlier if all futures are finished)
-            waitForFuturesRespectingTimeout(future);
+            waitForFuturesRespectingTimeout(Collections.singletonList(future));
             result = collectResultFromFuture(future);
         }
 
-        healthCheckResultCache.updateWith(result);
-
         return result;
     }
 
     /**
-     * Create the health check metadata
+     * Create the health check meta data
      */
     private List<HealthCheckMetadata> getHealthCheckMetadata(final ServiceReference... healthCheckReferences) {
         final List<HealthCheckMetadata> descriptors = new LinkedList<HealthCheckMetadata>();
@@ -274,13 +270,16 @@ public class HealthCheckExecutorImpl imp
     }
 
     /**
-     * Create the health check metadata
+     * Create the health check meta data
      */
     private HealthCheckMetadata getHealthCheckMetadata(final ServiceReference healthCheckReference) {
         final HealthCheckMetadata descriptor = new HealthCheckMetadata(healthCheckReference);
         return descriptor;
     }
 
+    /**
+     * Create or reuse future for the list of health checks
+     */
     private List<HealthCheckFuture> createOrReuseFutures(final List<HealthCheckMetadata> healthCheckDescriptors) {
         final List<HealthCheckFuture> futuresForResultOfThisCall = new LinkedList<HealthCheckFuture>();
 
@@ -292,6 +291,9 @@ public class HealthCheckExecutorImpl imp
         return futuresForResultOfThisCall;
     }
 
+    /**
+     * Create or reuse future for the health check
+     */
     private HealthCheckFuture createOrReuseFuture(final HealthCheckMetadata metadata) {
         HealthCheckFuture stillRunningFuture = this.stillRunningFutures.get(metadata);
         HealthCheckFuture resultFuture;
@@ -300,51 +302,51 @@ public class HealthCheckExecutorImpl imp
             resultFuture = stillRunningFuture;
         } else {
             logger.debug("Creating future for {}", metadata);
-            resultFuture = new HealthCheckFuture(metadata, bundleContext);
+            resultFuture = new HealthCheckFuture(metadata, bundleContext, new HealthCheckFuture.Callback() {
+
+                @Override
+                public void finished(final HealthCheckExecutionResult result) {
+                    healthCheckResultCache.updateWith(result);
+                    stillRunningFutures.remove(metadata);
+                }
+            });
             this.hcThreadPool.execute(resultFuture);
         }
 
         return resultFuture;
     }
 
-    private void waitForFuturesRespectingTimeout(final HealthCheckFuture healthCheckFuture) {
-        StopWatch callExcutionTimeStopWatch = new StopWatch();
-        callExcutionTimeStopWatch.start();
-        boolean allFuturesDone;
-        do {
-            try {
-                Thread.sleep(50);
-            } catch (InterruptedException ie) {
-                logger.warn("Unexpected InterruptedException while waiting for healthCheckContributors", ie);
-            }
-
-            allFuturesDone = healthCheckFuture.isDone();
-        } while (!allFuturesDone && callExcutionTimeStopWatch.getTime() < this.timeoutInMs);
-    }
-
-    private void waitForFuturesRespectingTimeout(List<HealthCheckFuture> futuresForResultOfThisCall) {
-        StopWatch callExcutionTimeStopWatch = new StopWatch();
+    /**
+     * Wait for the futures until the timeout is reached
+     */
+    private void waitForFuturesRespectingTimeout(final List<HealthCheckFuture> futuresForResultOfThisCall) {
+        final StopWatch callExcutionTimeStopWatch = new StopWatch();
         callExcutionTimeStopWatch.start();
         boolean allFuturesDone;
         do {
             try {
                 Thread.sleep(50);
-            } catch (InterruptedException ie) {
+            } catch (final InterruptedException ie) {
                 logger.warn("Unexpected InterruptedException while waiting for healthCheckContributors", ie);
             }
 
             allFuturesDone = true;
-            for (HealthCheckFuture healthCheckFuture : futuresForResultOfThisCall) {
+            for (final HealthCheckFuture healthCheckFuture : futuresForResultOfThisCall) {
                 allFuturesDone &= healthCheckFuture.isDone();
             }
         } while (!allFuturesDone && callExcutionTimeStopWatch.getTime() < this.timeoutInMs);
     }
 
-    void collectResultsFromFutures(List<HealthCheckFuture> futuresForResultOfThisCall, Collection<HealthCheckExecutionResult> results) {
+    /**
+     * Collect the results from all futures
+     * @param futuresForResultOfThisCall The list of futures
+     * @param results The result collection
+     */
+    void collectResultsFromFutures(final List<HealthCheckFuture> futuresForResultOfThisCall, final Collection<HealthCheckExecutionResult> results) {
 
-        Set<HealthCheckExecutionResult> resultsFromFutures = new HashSet<HealthCheckExecutionResult>();
+        final Set<HealthCheckExecutionResult> resultsFromFutures = new HashSet<HealthCheckExecutionResult>();
 
-        Iterator<HealthCheckFuture> futuresIt = futuresForResultOfThisCall.iterator();
+        final Iterator<HealthCheckFuture> futuresIt = futuresForResultOfThisCall.iterator();
         while (futuresIt.hasNext()) {
             final HealthCheckFuture future = futuresIt.next();
             final HealthCheckExecutionResult result = this.collectResultFromFuture(future);
@@ -357,6 +359,11 @@ public class HealthCheckExecutorImpl imp
         results.addAll(resultsFromFutures);
     }
 
+    /**
+     * Collect the result from a single future
+     * @param future The future
+     * @return The execution result or a result for a reached timeout
+     */
     HealthCheckExecutionResult collectResultFromFuture(final HealthCheckFuture future) {
 
         HealthCheckExecutionResult result;
@@ -365,18 +372,13 @@ public class HealthCheckExecutorImpl imp
 
             try {
                 result = future.get();
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 logger.warn("Unexpected Exception during future.get(): " + e, e);
                 long futureElapsedTimeMs = new Date().getTime() - future.getCreatedTime().getTime();
                 result = new ExecutionResult(future.getHealthCheckMetadata(), Result.Status.HEALTH_CHECK_ERROR,
                         "Unexpected Exception during future.get(): " + e, futureElapsedTimeMs, false);
             }
 
-            // if the future came from a previous call remove it from stillRunningFutures
-            if (this.stillRunningFutures.containsKey(future.getHealthCheckMetadata())) {
-                this.stillRunningFutures.remove(future.getHealthCheckMetadata());
-            }
-
         } else {
             logger.debug("Health Check timed out: {}", future.getHealthCheckMetadata());
             // Futures must not be cancelled as interrupting a health check might could cause a corrupted repository index

Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java?rev=1560567&r1=1560566&r2=1560567&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java Thu Jan 23 01:33:16 2014
@@ -25,6 +25,7 @@ import org.apache.commons.lang.StringUti
 import org.apache.commons.lang.time.StopWatch;
 import org.apache.sling.hc.api.HealthCheck;
 import org.apache.sling.hc.api.Result;
+import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
 import org.apache.sling.hc.util.HealthCheckMetadata;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -35,12 +36,17 @@ import org.slf4j.LoggerFactory;
  *
  */
 class HealthCheckFuture extends FutureTask<ExecutionResult> {
+
+    public interface Callback {
+        public void finished(final HealthCheckExecutionResult result);
+    }
+
     private final static Logger LOG = LoggerFactory.getLogger(HealthCheckFuture.class);
 
     private final HealthCheckMetadata metadata;
     private final Date createdTime;
 
-    HealthCheckFuture(final HealthCheckMetadata metadata, final BundleContext bundleContext) {
+    HealthCheckFuture(final HealthCheckMetadata metadata, final BundleContext bundleContext, final Callback callback) {
         super(new Callable<ExecutionResult>() {
             @Override
             public ExecutionResult call() throws Exception {
@@ -48,7 +54,7 @@ class HealthCheckFuture extends FutureTa
                         "Health-Check-" + StringUtils.substringAfterLast(metadata.getTitle(), "."));
                 LOG.debug("Starting check {}", metadata);
 
-                StopWatch stopWatch = new StopWatch();
+                final StopWatch stopWatch = new StopWatch();
                 stopWatch.start();
                 Result resultFromHealthCheck = null;
                 ExecutionResult executionResult = null;
@@ -62,9 +68,8 @@ class HealthCheckFuture extends FutureTa
                         throw new IllegalStateException("Service for " + metadata + " is gone");
                     }
 
-                } catch (Exception e) {
-                    resultFromHealthCheck = new Result(Result.Status.CRITICAL, "Exception during execution of " + this + ": " + e);
-                    // TODO ResultLog should be improved to be able to store exceptions
+                } catch (final Exception e) {
+                    resultFromHealthCheck = new Result(Result.Status.CRITICAL, "Exception during execution of " + this + ": " + e, e);
                 } finally {
                     // unget service ref
                     bundleContext.ungetService(metadata.getServiceReference());
@@ -80,6 +85,7 @@ class HealthCheckFuture extends FutureTa
                 }
 
                 Thread.currentThread().setName("Health-Check-idle");
+                callback.finished(executionResult);
                 return executionResult;
             }
         });

Modified: sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckResultCache.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckResultCache.java?rev=1560567&r1=1560566&r2=1560567&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckResultCache.java (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckResultCache.java Thu Jan 23 01:33:16 2014
@@ -47,15 +47,6 @@ public class HealthCheckResultCache {
     private final Map<Long, HealthCheckExecutionResult> cache = new ConcurrentHashMap<Long, HealthCheckExecutionResult>();
 
     /**
-     * Update the cache with the results
-     */
-    public void updateWith(final Collection<HealthCheckExecutionResult> results) {
-        for (final HealthCheckExecutionResult result : results) {
-            this.updateWith(result);
-        }
-    }
-
-    /**
      * Update the cache with the result
      */
     public void updateWith(HealthCheckExecutionResult result) {