Fixes to get tests running consistently.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4d45d1c4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4d45d1c4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4d45d1c4 Branch: refs/heads/master Commit: 4d45d1c4d4cbc6e921f94b69593ee3374013c711 Parents: 781b894 Author: Dave Johnson <snoopd...@apache.org> Authored: Mon Oct 3 10:49:24 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Mon Oct 3 10:49:24 2016 -0400 ---------------------------------------------------------------------- .../usergrid/persistence/qakka/api/QueueResource.java | 13 +++++-------- .../persistence/qakka/api/QueueResourceTest.java | 10 +++++----- .../queue/src/test/resources/qakka.properties | 2 ++ 3 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/4d45d1c4/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/QueueResource.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/QueueResource.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/QueueResource.java index f82661c..10dae04 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/QueueResource.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/qakka/api/QueueResource.java @@ -44,12 +44,11 @@ import java.util.UUID; public class QueueResource { private static final Logger logger = LoggerFactory.getLogger( QueueResource.class ); - private final QueueManager queueManager; + private final QueueManager queueManager; private final QueueMessageManager queueMessageManager; - private final MetricsService metricsService; - private final URIStrategy uriStrategy; - private final Regions regions; - private final ShardCounterSerialization shardCounterSerialization; + private final MetricsService metricsService; + private final URIStrategy uriStrategy; + private final Regions regions; @Inject @@ -58,15 +57,13 @@ public class QueueResource { QueueMessageManager queueMessageManager, MetricsService metricsService, URIStrategy uriStrategy, - Regions regions, - ShardCounterSerialization shardCounterSerialization ) { + Regions regions ) { this.queueManager = queueManager; this.queueMessageManager = queueMessageManager; this.metricsService = metricsService; this.uriStrategy = uriStrategy; this.regions = regions; - this.shardCounterSerialization = shardCounterSerialization; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/4d45d1c4/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/api/QueueResourceTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/api/QueueResourceTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/api/QueueResourceTest.java index c05281c..d723e97 100644 --- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/api/QueueResourceTest.java +++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/qakka/api/QueueResourceTest.java @@ -56,7 +56,7 @@ public class QueueResourceTest extends AbstractRestTest { // create a queue - String queueName = "qrt_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); + String queueName = "qrt_create_" + RandomStringUtils.randomAlphanumeric( 10 ); Map<String, Object> queueMap = new HashMap<String, Object>() {{ put("name", queueName); }}; @@ -87,7 +87,7 @@ public class QueueResourceTest extends AbstractRestTest { // create a queue - String queueName = "qrt_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); + String queueName = "qrt_delete_" + RandomStringUtils.randomAlphanumeric( 10 ); Map<String, Object> queueMap = new HashMap<String, Object>() {{ put("name", queueName); }}; Response response = target("queues").request() .post( Entity.entity( queueMap, MediaType.APPLICATION_JSON_TYPE)); @@ -149,7 +149,7 @@ public class QueueResourceTest extends AbstractRestTest { // create a queue - String queueName = "qrt_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); + String queueName = "qrt_json_" + RandomStringUtils.randomAlphanumeric( 10 ); Map<String, Object> queueMap = new HashMap<String, Object>() {{ put( "name", queueName ); }}; @@ -238,7 +238,7 @@ public class QueueResourceTest extends AbstractRestTest { // create a queue - String queueName = "qrt_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); + String queueName = "qrt_binarty_" + RandomStringUtils.randomAlphanumeric( 10 ); Map<String, Object> queueMap = new HashMap<String, Object>() {{ put( "name", queueName ); }}; @@ -316,7 +316,7 @@ public class QueueResourceTest extends AbstractRestTest { // create a queue - String queueName = "qrt_queue_" + RandomStringUtils.randomAlphanumeric( 10 ); + String queueName = "qrt_timeout_" + RandomStringUtils.randomAlphanumeric( 10 ); Map<String, Object> queueMap = new HashMap<String, Object>() {{ put("name", queueName); }}; target("queues").request().post( Entity.entity( queueMap, MediaType.APPLICATION_JSON_TYPE)); http://git-wip-us.apache.org/repos/asf/usergrid/blob/4d45d1c4/stack/corepersistence/queue/src/test/resources/qakka.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/test/resources/qakka.properties b/stack/corepersistence/queue/src/test/resources/qakka.properties index fb46f3d..ef1be80 100644 --- a/stack/corepersistence/queue/src/test/resources/qakka.properties +++ b/stack/corepersistence/queue/src/test/resources/qakka.properties @@ -36,6 +36,8 @@ usergrid.cluster.seeds=us-east:localhost # Port used for cluster communications. usergrid.cluster.port=2551 +queue.num.actors=50 +queue.sender.num.actors=100 queue.writer.num.actors=100 # set shard size and times low for testing purposes
