Repository: usergrid Updated Branches: refs/heads/master 2578e938a -> dd46ebe8f
Reduce retries in refreshIndex() and tone down exceptions that occur when keyspace or table not yet created. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/20c425be Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/20c425be Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/20c425be Branch: refs/heads/master Commit: 20c425beb9f01308aaf499135173ea83947dbaeb Parents: 40e1c06 Author: Dave Johnson <[email protected]> Authored: Sat Nov 19 17:41:12 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Sat Nov 19 17:41:12 2016 -0500 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 2 +- .../asyncevents/AsyncEventServiceImpl.java | 25 ++++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/20c425be/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java index efe2eef..1071842 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java @@ -3108,7 +3108,7 @@ public class CpEntityManager implements EntityManager { = managerCache.getEntityIndex(applicationScope).refreshAsync().toBlocking().first(); try { - for (int i = 0; i < 40; i++) { + for (int i = 0; i < 20; i++) { if (searchCollection( new SimpleEntityRef( org.apache.usergrid.persistence.entities.Application.ENTITY_TYPE, getApplicationId()), http://git-wip-us.apache.org/repos/asf/usergrid/blob/20c425be/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java index 412a173..e565754 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AsyncEventServiceImpl.java @@ -24,6 +24,7 @@ import com.codahale.metrics.Counter; import com.codahale.metrics.Gauge; import com.codahale.metrics.Histogram; import com.codahale.metrics.Timer; +import com.datastax.driver.core.exceptions.InvalidQueryException; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.inject.Inject; @@ -871,26 +872,30 @@ public class AsyncEventServiceImpl implements AsyncEventService { //take since we're in flight inFlight.addAndGet( drainList.size() ); - } - catch ( Throwable t ) { + + } catch ( Throwable t ) { + final long sleepTime = indexProcessorFig.getFailureRetryTime(); // there might be an error here during tests, just clean the cache queue.clearQueueNameCache(); - logger.error( "Failed to dequeue. Sleeping for {} milliseconds", sleepTime, t ); + if ( t instanceof InvalidQueryException ) { + + // don't fill up log with exceptions when keyspace and column + // families are not ready during bootstrap/setup + logger.warn( "Failed to dequeue due to '{}'. Sleeping for {} ms", + t.getMessage(), sleepTime ); + + } else { + logger.error( "Failed to dequeue. Sleeping for {} ms", sleepTime, t); + } if ( drainList != null ) { inFlight.addAndGet( -1 * drainList.size() ); } - - try { - Thread.sleep( sleepTime ); - } - catch ( InterruptedException ie ) { - //swallow - } + try { Thread.sleep( sleepTime ); } catch ( InterruptedException ie ) {} indexErrorCounter.inc(); }
