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/10/24 14:35:32 UTC

svn commit: r1634045 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues: AbstractJobQueue.java OrderedJobQueue.java

Author: cziegeler
Date: Fri Oct 24 12:35:31 2014
New Revision: 1634045

URL: http://svn.apache.org/r1634045
Log:
SLING-4102 : Queue state information missing

Modified:
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/AbstractJobQueue.java
    sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/AbstractJobQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/AbstractJobQueue.java?rev=1634045&r1=1634044&r2=1634045&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/AbstractJobQueue.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/AbstractJobQueue.java Fri Oct 24 12:35:31 2014
@@ -931,12 +931,19 @@ public abstract class AbstractJobQueue
     @Override
     public String getStateInfo() {
         synchronized ( this.suspendLock ) {
-            return "isWaiting=" + this.isWaiting +
+            return "outdated=" + this.isOutdated.get() +
+                    ", isWaiting=" + this.isWaiting +
+                    ", isWaitingForNextJob=" + this.isWaitingForNextJob +
                     ", suspendedSince=" + this.suspendedSince +
                     ", asyncJobs=" + this.asyncCounter.get();
         }
     }
 
+    /**
+     * Get the retry delay for a job.
+     * @param handler The job handler.
+     * @return The retry delay
+     */
     protected long getRetryDelay(final JobHandler handler) {
         long delay = this.configuration.getRetryDelayInMs();
         if ( handler.getJob().getProperty(JobImpl.PROPERTY_DELAY_OVERRIDE) != null ) {

Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java?rev=1634045&r1=1634044&r2=1634045&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java Fri Oct 24 12:35:31 2014
@@ -34,8 +34,8 @@ public final class OrderedJobQueue exten
     /** Object to sync operations within this queue. */
     private final Object syncLock = new Object();
 
-    /** Sleep delay if job needs rescheduling. */
-    private long sleepDelay = -1;
+    /** Sleeping until. */
+    private volatile long sleepingUntil;
 
     public OrderedJobQueue(final String name,
                            final InternalQueueConfiguration config,
@@ -58,19 +58,20 @@ public final class OrderedJobQueue exten
                         Thread.currentThread().interrupt();
                     }
                 }
-                if ( this.sleepDelay > 0 ) {
-                    final long waitingTime = this.sleepDelay;
-                    final long startTime = System.currentTimeMillis();
-                    this.logger.debug("Job queue {} is sleeping {}ms for retry.", this.queueName, waitingTime);
-                    while ( this.sleepDelay > 0 ) {
-                        try {
-                            this.syncLock.wait(waitingTime);
-                            if ( System.currentTimeMillis() >= startTime + waitingTime ) {
-                                this.sleepDelay = -1;
+                if ( this.sleepingUntil != -1 ) {
+                    final long waitingTime = this.sleepingUntil - System.currentTimeMillis();
+                    if ( waitingTime > 0 ) {
+                        this.logger.debug("Job queue {} is sleeping {}ms for retry.", this.queueName, waitingTime);
+                        while ( this.sleepingUntil != -1 ) {
+                            try {
+                                this.syncLock.wait(waitingTime);
+                                if ( System.currentTimeMillis() >= this.sleepingUntil ) {
+                                    this.sleepingUntil = -1;
+                                }
+                            } catch (final InterruptedException e) {
+                                this.ignoreException(e);
+                                Thread.currentThread().interrupt();
                             }
-                        } catch (final InterruptedException e) {
-                            this.ignoreException(e);
-                            Thread.currentThread().interrupt();
                         }
                     }
                 }
@@ -82,7 +83,12 @@ public final class OrderedJobQueue exten
     @Override
     protected void reschedule(final JobHandler handler) {
         super.reschedule(handler);
-        this.sleepDelay = this.getRetryDelay(handler);
+        final long retryDelay = this.getRetryDelay(handler);
+        if ( retryDelay > 0 ) {
+            this.sleepingUntil = System.currentTimeMillis() + retryDelay;
+        } else {
+            this.sleepingUntil = -1;
+        }
     }
 
     @Override
@@ -91,10 +97,23 @@ public final class OrderedJobQueue exten
         synchronized ( this.syncLock ) {
             this.isWaiting = false;
             if ( !reschedule ) {
-                this.sleepDelay = -1;
+                this.sleepingUntil = -1;
             }
             this.syncLock.notify();
         }
     }
+
+    @Override
+    public String getStateInfo() {
+        return super.getStateInfo() + ", isSleepingUntil=" + this.sleepingUntil;
+    }
+
+    @Override
+    public Object getState(final String key) {
+        if ( "isSleepingUntil".equals(key) ) {
+            return this.sleepingUntil;
+        }
+        return super.getState(key);
+    }
 }