Turn on Qakka for services and rest tests too, plus a test fix.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fdd4e0be Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fdd4e0be Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fdd4e0be Branch: refs/heads/master Commit: fdd4e0be3aa297872f79b4ebeacba938d83fc637 Parents: 278abd2 Author: Dave Johnson <[email protected]> Authored: Fri Nov 18 18:34:12 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Nov 18 18:34:12 2016 -0500 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpEntityManager.java | 2 +- .../src/test/resources/usergrid-custom-test.properties | 2 +- .../usergrid/persistence/queue/guice/QueueModule.java | 12 +++++------- .../src/test/resources/usergrid-custom-test.properties | 2 ++ .../src/test/resources/usergrid-custom-test.properties | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdd4e0be/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 c6a757e..67f52cf 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 < 20; i++) { + for (int i = 0; i < 40; i++) { if (searchCollection( new SimpleEntityRef( org.apache.usergrid.persistence.entities.Application.ENTITY_TYPE, getApplicationId()), http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdd4e0be/stack/core/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties index 4070d4a..a3dfc94 100644 --- a/stack/core/src/test/resources/usergrid-custom-test.properties +++ b/stack/core/src/test/resources/usergrid-custom-test.properties @@ -28,7 +28,7 @@ elasticsearch.management_number_replicas=0 elasticsearch.managment_index=usergrid_core_management #cassandra.keyspace.application=core_tests_schema elasticsearch.queue_impl.resolution=true -elasticsearch.queue_impl=LOCAL +elasticsearch.queue_impl=DISTRIBUTED elasticsearch.buffer_timeout=1 http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdd4e0be/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java index e426247..949f1f2 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/guice/QueueModule.java @@ -27,8 +27,6 @@ import org.apache.usergrid.persistence.queue.impl.QueueManagerFactoryImpl; import org.apache.usergrid.persistence.queue.impl.SNSQueueManagerImpl; import org.safehaus.guicyfig.GuicyFigModule; -import java.util.Properties; - /** * Simple module for wiring our collection api @@ -37,17 +35,18 @@ public class QueueModule extends AbstractModule { private LegacyQueueManager.Implementation implementation; + public QueueModule( String queueManagerType ) { - if ( "LOCAL".equals( queueManagerType ) ) { - this.implementation = LegacyQueueManager.Implementation.LOCAL; - } - else if ( "DISTRIBUTED_SNS".equals( queueManagerType ) ) { + if ( "DISTRIBUTED_SNS".equals( queueManagerType ) ) { this.implementation = LegacyQueueManager.Implementation.DISTRIBUTED_SNS; } else if ( "DISTRIBUTED".equals( queueManagerType ) ) { this.implementation = LegacyQueueManager.Implementation.DISTRIBUTED; } + else { + this.implementation = LegacyQueueManager.Implementation.LOCAL; + } } @@ -61,7 +60,6 @@ public class QueueModule extends AbstractModule { switch (implementation) { case LOCAL: - install( new FactoryModuleBuilder().implement( LegacyQueueManager.class, LocalQueueManager.class ) .build( LegacyQueueManagerInternalFactory.class ) ); break; http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdd4e0be/stack/rest/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties index 91fbf96..1a65808 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -66,3 +66,5 @@ usergrid.cluster.port=2555 collection.uniquevalues.actors=300 collection.uniquevalues.authoritative.region=us-east + +elasticsearch.queue_impl=DISTRIBUTED http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdd4e0be/stack/services/src/test/resources/usergrid-custom-test.properties ---------------------------------------------------------------------- diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties index c19da59..03343d2 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -33,7 +33,7 @@ elasticsearch.managment_index=usergrid_services_management elasticsearch.buffer_timeout=1 elasticsearch.queue_impl.resolution=true -usergrid.use.default.queue=true +elasticsearch.queue_impl=DISTRIBUTED # This property is required to be set and cannot be defaulted anywhere
