You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2015/10/26 16:09:09 UTC
svn commit: r1710614 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation:
ChangeProcessor.java ObservationManagerImpl.java
Author: alexparvulescu
Date: Mon Oct 26 15:09:09 2015
New Revision: 1710614
URL: http://svn.apache.org/viewvc?rev=1710614&view=rev
Log:
OAK-3546 Improve ObservationManagerImpl timeout message
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1710614&r1=1710613&r2=1710614&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java Mon Oct 26 15:09:09 2015
@@ -108,7 +108,16 @@ class ChangeProcessor implements Observe
private final int queueLength;
private final CommitRateLimiter commitRateLimiter;
+ /**
+ * Lazy initialization via the {@link #start(Whiteboard)} method
+ */
+ private String listenerId;
+
+ /**
+ * Lazy initialization via the {@link #start(Whiteboard)} method
+ */
private CompositeRegistration registration;
+
private volatile NodeState previousRoot;
public ChangeProcessor(
@@ -150,7 +159,8 @@ class ChangeProcessor implements Observe
final WhiteboardExecutor executor = new WhiteboardExecutor();
executor.start(whiteboard);
final BackgroundObserver observer = createObserver(executor);
- Map<String, String> attrs = ImmutableMap.of(LISTENER_ID, String.valueOf(COUNTER.incrementAndGet()));
+ listenerId = COUNTER.incrementAndGet() + "";
+ Map<String, String> attrs = ImmutableMap.of(LISTENER_ID, listenerId);
String name = tracker.toString();
registration = new CompositeRegistration(
registerObserver(whiteboard, observer),
@@ -417,4 +427,16 @@ class ChangeProcessor implements Observe
return !wasStopped;
}
}
+
+ @Override
+ public String toString() {
+ return "ChangeProcessor ["
+ + "listenerId=" + listenerId
+ + ", tracker=" + tracker
+ + ", contentSession=" + contentSession
+ + ", eventCount=" + eventCount
+ + ", eventDuration=" + eventDuration
+ + ", commitRateLimiter=" + commitRateLimiter
+ + ", running=" + running.isSatisfied() + "]";
+ }
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java?rev=1710614&r1=1710613&r2=1710614&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java Mon Oct 26 15:09:09 2015
@@ -335,8 +335,12 @@ public class ObservationManagerImpl impl
private static void stop(ChangeProcessor processor) {
if (!processor.stopAndWait(STOP_TIME_OUT, MILLISECONDS)) {
- LOG.warn(OBSERVATION, "Timed out waiting for change processor to stop after " +
- STOP_TIME_OUT + " milliseconds. Falling back to asynchronous stop.");
+ LOG.warn(
+ OBSERVATION,
+ "Timed out waiting for change processor to stop after "
+ + STOP_TIME_OUT
+ + " milliseconds. Falling back to asynchronous stop on "
+ + processor);
processor.stop();
}
}