Merged from 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7975e4f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7975e4f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7975e4f3 Branch: refs/heads/two-dot-o-dev Commit: 7975e4f3b204253a52a81c9e398f0e9e9ffb79c2 Parents: 07c5de0 Author: Todd Nine <[email protected]> Authored: Fri Mar 27 09:47:29 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Fri Mar 27 09:47:29 2015 -0600 ---------------------------------------------------------------------- .../persistence/index/impl/EsIndexBufferConsumerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7975e4f3/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java index d064b97..6d5a4d8 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java @@ -177,7 +177,8 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer { timer.stop(); } - + //DO NOT add any doOnError* functions to this subscription. We want the producer + //to receive these exceptions and sleep before a retry catch ( Throwable t ) { final long sleepTime = config.getFailureRetryTime(); @@ -187,7 +188,6 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer { inFlight.addAndGet( -1 * drainList.size() ); } - try { Thread.sleep( sleepTime ); }
