Reduce retries in refreshIndex() and tone down exceptions that occur when keyspace or table not yet created.
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 @@
= 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()),
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.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 @@
//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();
}
