You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/28 22:14:57 UTC
[3/5] usergrid git commit: Shorten the static parts of the queue
names to help with AWS queue name limit of 80 chars.
Shorten the static parts of the queue names to help with AWS queue name limit of 80 chars.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8b6d4b69
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8b6d4b69
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8b6d4b69
Branch: refs/heads/two-dot-o-dev
Commit: 8b6d4b694d8dbe298d4d49ec0f79bc98243234f3
Parents: 45156eb
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Aug 27 20:59:14 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Aug 27 20:59:14 2015 -0700
----------------------------------------------------------------------
.../corepersistence/asyncevents/AmazonAsyncEventService.java | 4 ++--
.../org/apache/usergrid/persistence/queue/QueueScope.java | 8 ++++----
.../usergrid/persistence/queue/impl/SNSQueueManagerImpl.java | 2 +-
.../apache/usergrid/persistence/queue/QueueManagerTest.java | 2 +-
.../services/notifications/ApplicationQueueManager.java | 2 +-
.../services/notifications/NotificationsService.java | 5 +----
.../usergrid/services/notifications/QueueListener.java | 6 ++----
.../org/apache/usergrid/services/queues/QueueListener.java | 2 +-
8 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
index 46c7076..d7e575b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java
@@ -80,7 +80,7 @@ public class AmazonAsyncEventService implements AsyncEventService {
// SQS maximum receive messages is 10
private static final int MAX_TAKE = 10;
- public static final String QUEUE_NAME = "es_queue";
+ public static final String QUEUE_NAME = "es"; //keep this short as AWS limits queue name size to 80 chars
private final QueueManager queue;
private final QueueScope queueScope;
@@ -122,7 +122,7 @@ public class AmazonAsyncEventService implements AsyncEventService {
this.eventBuilder = eventBuilder;
this.rxTaskScheduler = rxTaskScheduler;
- this.queueScope = new QueueScopeImpl(QUEUE_NAME, QueueScope.RegionImplementation.ALLREGIONS);
+ this.queueScope = new QueueScopeImpl(QUEUE_NAME, QueueScope.RegionImplementation.ALL);
this.queue = queueManagerFactory.getQueueManager(queueScope);
this.indexProcessorFig = indexProcessorFig;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueScope.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueScope.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueScope.java
index 4beacf6..f58584f 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueScope.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueScope.java
@@ -24,12 +24,12 @@ import org.apache.usergrid.persistence.core.scope.ApplicationScope;
public interface QueueScope {
/**
- * LOCALREGION will create a SNS topic with a queue subscription in a single AWS region.
- * ALLREGIONS will create SNS topics and queue subscriptions in ALL AWS regions.
+ * LOCAL will create a SNS topic with a queue subscription in a single AWS region.
+ * ALL will create SNS topics and queue subscriptions in ALL AWS regions.
*/
enum RegionImplementation {
- LOCALREGION,
- ALLREGIONS
+ LOCAL,
+ ALL
}
/**
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
index d3a011e..7e1e99c 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java
@@ -161,7 +161,7 @@ public class SNSQueueManagerImpl implements QueueManager {
logger.error(String.format("Unable to subscribe PRIMARY queue=[%s] to topic=[%s]", queueUrl, primaryTopicArn), e);
}
- if (fig.isMultiRegion() && scope.getRegionImplementation() == QueueScope.RegionImplementation.ALLREGIONS) {
+ if (fig.isMultiRegion() && scope.getRegionImplementation() == QueueScope.RegionImplementation.ALL) {
String multiRegion = fig.getRegionList();
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
index f265620..29e88ce 100644
--- a/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
+++ b/stack/corepersistence/queue/src/test/java/org/apache/usergrid/persistence/queue/QueueManagerTest.java
@@ -66,7 +66,7 @@ public class QueueManagerTest {
@Before
public void mockApp() {
- this.scope = new QueueScopeImpl( "testQueue", QueueScope.RegionImplementation.LOCALREGION );
+ this.scope = new QueueScopeImpl( "testQueue", QueueScope.RegionImplementation.LOCAL);
qm = qmf.getQueueManager(scope);
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
index 101c839..6bbd117 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueManager.java
@@ -36,7 +36,7 @@ public interface ApplicationQueueManager {
public static final String NOTIFIER_ID_POSTFIX = ".notifier.id";
- public static final String DEFAULT_QUEUE_NAME = "push_v1";
+ public static final String DEFAULT_QUEUE_NAME = "push"; //keep this short as AWS limits queue name size to 80 chars
/**
* send notification to queue
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
index 7e54a93..2a72a01 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/NotificationsService.java
@@ -19,7 +19,6 @@ package org.apache.usergrid.services.notifications;
import java.util.*;
-import org.apache.usergrid.persistence.queue.DefaultQueueManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,10 +26,8 @@ import org.apache.usergrid.mq.Message;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.persistence.EntityRef;
-import org.apache.usergrid.persistence.PathQuery;
import org.apache.usergrid.persistence.SimpleEntityRef;
import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
-import org.apache.usergrid.persistence.entities.Device;
import org.apache.usergrid.persistence.entities.Notification;
import org.apache.usergrid.persistence.entities.Notifier;
import org.apache.usergrid.persistence.entities.Receipt;
@@ -104,7 +101,7 @@ public class NotificationsService extends AbstractCollectionService {
postTimer = metricsService.getTimer(this.getClass(), "collection.post_requests");
JobScheduler jobScheduler = new JobScheduler(sm,em);
String name = ApplicationQueueManagerImpl.getQueueNames( props );
- QueueScope queueScope = new QueueScopeImpl( name, QueueScope.RegionImplementation.LOCALREGION );
+ QueueScope queueScope = new QueueScopeImpl( name, QueueScope.RegionImplementation.LOCAL);
queueManagerFactory = getApplicationContext().getBean( Injector.class ).getInstance(QueueManagerFactory.class);
QueueManager queueManager = queueManagerFactory.getQueueManager(queueScope);
notificationQueueManager = new ApplicationQueueManagerImpl(jobScheduler,em,queueManager,metricsService,props);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
index eba0060..7e271c9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/QueueListener.java
@@ -21,8 +21,6 @@ import com.codahale.metrics.Timer;
import com.google.common.cache.*;
import com.google.inject.Injector;
-import org.apache.usergrid.corepersistence.CpSetup;
-
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.EntityManagerFactory;
@@ -36,7 +34,7 @@ import org.apache.usergrid.services.notifications.impl.ApplicationQueueManagerIm
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rx.Observable;
-import javax.annotation.PostConstruct;
+
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
@@ -146,7 +144,7 @@ public class QueueListener {
com.codahale.metrics.Timer timer = metricsService.getTimer(QueueListener.class, "execute.dequeue");
svcMgr = smf.getServiceManager(smf.getManagementAppId());
LOG.info("getting from queue {} ", queueName);
- QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCALREGION );
+ QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCAL);
QueueManager queueManager = TEST_QUEUE_MANAGER != null ? TEST_QUEUE_MANAGER : queueManagerFactory.getQueueManager(queueScope);
// run until there are no more active jobs
final AtomicLong runCount = new AtomicLong(0);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/8b6d4b69/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
index bd57bb3..36e347e 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/queues/QueueListener.java
@@ -160,7 +160,7 @@ public abstract class QueueListener {
LOG.info("QueueListener: Starting execute process.");
svcMgr = smf.getServiceManager(smf.getManagementAppId());
LOG.info("getting from queue {} ", queueName);
- QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCALREGION);
+ QueueScope queueScope = new QueueScopeImpl( queueName, QueueScope.RegionImplementation.LOCAL);
QueueManager queueManager = TEST_QUEUE_MANAGER != null ? TEST_QUEUE_MANAGER : queueManagerFactory.getQueueManager(queueScope);
// run until there are no more active jobs
long runCount = 0;