You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/12 18:23:41 UTC
incubator-usergrid git commit: add cluster name
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 7123d0f68 -> 3f0b0a60f
add cluster name
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3f0b0a60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3f0b0a60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3f0b0a60
Branch: refs/heads/two-dot-o-dev
Commit: 3f0b0a60f08e3c9529de4383496a9c713c7a811b
Parents: 7123d0f
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 10:23:24 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 10:23:24 2015 -0600
----------------------------------------------------------------------
.../index/ApplicationIndexLocationStrategy.java | 13 ++---
.../index/IndexLocationStrategyFactoryImpl.java | 10 ++--
.../index/ManagementIndexLocationStrategy.java | 7 ++-
.../corepersistence/index/IndexNamingTest.java | 56 ++++++++++++++------
.../persistence/core/guice/CommonModule.java | 31 +++++------
.../persistence/core/guicyfig/ClusterFig.java | 38 +++++++++++++
.../index/IndexLocationStrategy.java | 2 -
.../queue/impl/SNSQueueManagerImpl.java | 7 ++-
.../queue/impl/SQSQueueManagerImpl.java | 7 ++-
9 files changed, 124 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
index f09dcbb..bc329e2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
@@ -20,6 +20,7 @@
package org.apache.usergrid.corepersistence.index;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.index.IndexAlias;
import org.apache.usergrid.persistence.index.IndexFig;
@@ -30,6 +31,7 @@ import org.apache.usergrid.utils.StringUtils;
* Strategy for getting the application index name.
*/
class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
+ private final ClusterFig clusterFig;
private final CassandraFig cassandraFig;
private final IndexFig indexFig;
private final ApplicationScope applicationScope;
@@ -38,18 +40,19 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
private final IndexAlias alias;
private final String indexRootName;
- public ApplicationIndexLocationStrategy(final CassandraFig cassandraFig,
+ public ApplicationIndexLocationStrategy(final ClusterFig clusterFig,
+ final CassandraFig cassandraFig,
final IndexFig indexFig,
final ApplicationScope applicationScope,
final ApplicationIndexBucketLocator applicationIndexBucketLocator){
+ this.clusterFig = clusterFig;
this.cassandraFig = cassandraFig;
this.indexFig = indexFig;
this.applicationScope = applicationScope;
this.applicationIndexBucketLocator = applicationIndexBucketLocator;
- this.indexRootName =cassandraFig.getApplicationKeyspace().toLowerCase(); //TODO: add hash buckets by app scope
+ this.indexRootName = clusterFig.getClusterName() + "_" + cassandraFig.getApplicationKeyspace().toLowerCase();
this.alias = new ApplicationIndexAlias(indexFig, applicationScope, indexRootName);
-
this.indexBucketName = indexRootName + "_" + applicationIndexBucketLocator.getBucket(applicationScope);
}
@@ -60,8 +63,6 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
*/
@Override
public IndexAlias getAlias() {
- //TODO: include appid
-
return alias;
}
@@ -71,7 +72,7 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
*/
@Override
public String getIndexRootName() {
- return indexBucketName;
+ return indexRootName;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
index 6fc0a32..55888d12 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java
@@ -22,6 +22,7 @@ package org.apache.usergrid.corepersistence.index;
import com.google.inject.Inject;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.index.IndexFig;
import org.apache.usergrid.persistence.index.IndexLocationStrategy;
@@ -30,13 +31,16 @@ import org.apache.usergrid.persistence.index.IndexLocationStrategy;
* Parse app id and get the correct strategy
*/
public class IndexLocationStrategyFactoryImpl implements IndexLocationStrategyFactory {
+ private final ClusterFig clusterFig;
private final CassandraFig cassandraFig;
private final IndexFig indexFig;
private final ApplicationIndexBucketLocator applicationLocatorBucketStrategy;
private final CoreIndexFig coreIndexFig;
+
@Inject
- public IndexLocationStrategyFactoryImpl(final CassandraFig cassandraFig, final IndexFig indexFig, final ApplicationIndexBucketLocator applicationLocatorBucketStrategy, final CoreIndexFig coreIndexFig){
+ public IndexLocationStrategyFactoryImpl(ClusterFig clusterFig, final CassandraFig cassandraFig, final IndexFig indexFig, final ApplicationIndexBucketLocator applicationLocatorBucketStrategy, final CoreIndexFig coreIndexFig){
+ this.clusterFig = clusterFig;
this.cassandraFig = cassandraFig;
this.indexFig = indexFig;
@@ -45,9 +49,9 @@ public class IndexLocationStrategyFactoryImpl implements IndexLocationStrategyFa
}
public IndexLocationStrategy getIndexLocationStrategy(ApplicationScope applicationScope){
if(CpNamingUtils.getManagementApplicationId().equals(applicationScope.getApplication())){
- return new ManagementIndexLocationStrategy(indexFig,coreIndexFig);
+ return new ManagementIndexLocationStrategy(clusterFig,indexFig,coreIndexFig);
}
- return new ApplicationIndexLocationStrategy(cassandraFig,indexFig,applicationScope, applicationLocatorBucketStrategy);
+ return new ApplicationIndexLocationStrategy(clusterFig,cassandraFig,indexFig,applicationScope, applicationLocatorBucketStrategy);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
index cfbf409..79b14ca 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
@@ -20,6 +20,7 @@
package org.apache.usergrid.corepersistence.index;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.index.IndexAlias;
@@ -33,17 +34,19 @@ import org.apache.usergrid.utils.StringUtils;
*/
class ManagementIndexLocationStrategy implements IndexLocationStrategy {
private final String indexName;
+ private final ClusterFig clusterFig;
private final IndexFig indexFig;
private final CoreIndexFig coreIndexFig;
private final IndexAlias alias;
private final ApplicationScope applicationScope;
- public ManagementIndexLocationStrategy(final IndexFig indexFig, final CoreIndexFig coreIndexFig){
+ public ManagementIndexLocationStrategy(final ClusterFig clusterFig, final IndexFig indexFig, final CoreIndexFig coreIndexFig){
+ this.clusterFig = clusterFig;
this.indexFig = indexFig;
this.coreIndexFig = coreIndexFig;
this.applicationScope = CpNamingUtils.getApplicationScope( CpNamingUtils.getManagementApplicationId().getUuid());
//remove usergrid
- this.indexName = coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
+ this.indexName = clusterFig.getClusterName() + "_" + coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
this.alias = new ManagementIndexAlias(indexFig,indexName);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
index 5f04553..7326a6f 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
@@ -25,6 +25,7 @@ import org.apache.usergrid.corepersistence.TestIndexModule;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.IndexBucketLocator;
import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.core.test.UseModules;
@@ -57,6 +58,8 @@ public class IndexNamingTest {
@Inject
public IndexFig indexFig;
+ @Inject
+ public ClusterFig clusterFig;
@Inject
public CoreIndexFig indexProcessorFig;
@@ -71,47 +74,71 @@ public class IndexNamingTest {
private ApplicationScope managementApplicationScope;
private ApplicationIndexLocationStrategy applicationLocationStrategy;
private ManagementIndexLocationStrategy managementLocationStrategy;
+ private String keyspacename;
+ private String clusterName;
@Before
public void setup(){
+ keyspacename = cassandraFig.getApplicationKeyspace().toLowerCase();
+ clusterName = clusterFig.getClusterName();
this.applicationScope = CpNamingUtils.getApplicationScope(UUID.randomUUID());
this.managementApplicationScope = CpNamingUtils.getApplicationScope(CpNamingUtils.getManagementApplicationId().getUuid());
- this.managementLocationStrategy = new ManagementIndexLocationStrategy(indexFig, indexProcessorFig);
- this.applicationLocationStrategy = new ApplicationIndexLocationStrategy(cassandraFig,indexFig,applicationScope,bucketLocator);
+ this.managementLocationStrategy = new ManagementIndexLocationStrategy(clusterFig,indexFig, indexProcessorFig);
+ this.applicationLocationStrategy = new ApplicationIndexLocationStrategy(clusterFig, cassandraFig,indexFig,applicationScope,bucketLocator);
}
@Test
public void managementNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
assertEquals(indexLocationStrategy.getIndexRootName(),managementLocationStrategy.getIndexRootName());
- assertEquals(indexLocationStrategy.getIndexRootName(),indexProcessorFig.getManagementAppIndexName());
+ assertEquals(indexLocationStrategy.getIndexRootName(),clusterName + "_" + indexProcessorFig.getManagementAppIndexName());
assertEquals(indexLocationStrategy.getIndexRootName(), indexLocationStrategy.getIndexBucketName());
- assertEquals(indexLocationStrategy.getIndexBucketName(),indexProcessorFig.getManagementAppIndexName());
+ assertEquals(indexLocationStrategy.getIndexBucketName(),clusterName + "_"+indexProcessorFig.getManagementAppIndexName());
}
@Test
- public void applicationNaming(){
+ public void applicationRootNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope);
- assertEquals(indexLocationStrategy.getIndexRootName(),applicationLocationStrategy.getIndexRootName());
+ assertEquals(
+ indexLocationStrategy.getIndexRootName(),
+ applicationLocationStrategy.getIndexRootName()
+ );
+
+ assertEquals(
+ indexLocationStrategy.getIndexRootName(),
+ clusterName + "_" + keyspacename
+ );
+ assertEquals(
+ indexLocationStrategy.getAlias().getReadAlias(),
+ clusterName + "_" + keyspacename+"_"+ applicationScope.getApplication().getUuid().toString().toLowerCase() + "_read_" + indexFig.getAliasPostfix()
+ );
+ assertEquals(
+ indexLocationStrategy.getAlias().getWriteAlias(),
+ clusterName + "_" + keyspacename+"_"+ applicationScope.getApplication().getUuid().toString().toLowerCase() + "_write_" + indexFig.getAliasPostfix()
+ );
+
+ }
- assertTrue(indexLocationStrategy.getIndexRootName().contains(cassandraFig.getApplicationKeyspace().toLowerCase()));
- assertTrue(indexLocationStrategy.getAlias().getReadAlias().contains(applicationScope.getApplication().getUuid().toString().toLowerCase()));
- assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains(applicationScope.getApplication().getUuid().toString().toLowerCase()));
- assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains("write"));
- assertTrue(indexLocationStrategy.getAlias().getReadAlias().contains("read"));
+ @Test
+ public void applicationBucketNaming(){
Set<String> names = new HashSet<>();
for(int i=0;i<10;i++){
- IndexLocationStrategy indexLocationStrategyBucket = new ApplicationIndexLocationStrategy(cassandraFig,indexFig,applicationScope, new ApplicationIndexBucketLocator(indexProcessorFig));
+ IndexLocationStrategy indexLocationStrategyBucket =
+ new ApplicationIndexLocationStrategy(
+ clusterFig, cassandraFig, indexFig,applicationScope,
+ new ApplicationIndexBucketLocator(indexProcessorFig)
+ );
names.add(indexLocationStrategyBucket.getIndexBucketName());
}
- String expectedName = cassandraFig.getApplicationKeyspace().toLowerCase()+"_\\d+";
+ String expectedName = clusterName+"_"+keyspacename+"_\\d+";
Pattern regex = Pattern.compile(expectedName);
//always hashes to same bucket
assertTrue(names.size() == 1);
- names = new HashSet<>();
+ names = new HashSet<>();
for(int i=0;i<100;i++){
IndexLocationStrategy indexLocationStrategyBucket =
new ApplicationIndexLocationStrategy(
+ clusterFig,
cassandraFig,
indexFig,
new ApplicationScopeImpl(CpNamingUtils.generateApplicationId(UUID.randomUUID())),
@@ -122,7 +149,6 @@ public class IndexNamingTest {
}
//always hashes to diff't bucket
assertTrue(names.size()==indexProcessorFig.getNumberOfIndexBuckets());
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
index f266643..543600a 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
@@ -19,6 +19,7 @@
package org.apache.usergrid.persistence.core.guice;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
import org.apache.usergrid.persistence.core.metrics.MetricsFactoryImpl;
import org.apache.usergrid.persistence.core.metrics.MetricsFig;
@@ -55,49 +56,49 @@ public class CommonModule extends AbstractModule {
@Override
protected void configure() {
//noinspection unchecked
- install( new GuicyFigModule( MigrationManagerFig.class, CassandraFig.class ) );
+ install(new GuicyFigModule(MigrationManagerFig.class, CassandraFig.class));
// bind our keyspace to the AstyanaxKeyspaceProvider
- bind( Keyspace.class ).toProvider( AstyanaxKeyspaceProvider.class ).asEagerSingleton();
+ bind(Keyspace.class).toProvider(AstyanaxKeyspaceProvider.class).asEagerSingleton();
// bind our migration manager
- bind( MigrationManager.class ).to( MigrationManagerImpl.class );
-
+ bind(MigrationManager.class).to(MigrationManagerImpl.class);
//do multibindings for migrations
- Multibinder<Migration> migrationBinding = Multibinder.newSetBinder( binder(), Migration.class );
- migrationBinding.addBinding().to( Key.get( MigrationInfoSerialization.class ) );
+ Multibinder<Migration> migrationBinding = Multibinder.newSetBinder(binder(), Migration.class);
+ migrationBinding.addBinding().to(Key.get(MigrationInfoSerialization.class));
- bind( TimeService.class ).to( TimeServiceImpl.class );
+ bind(TimeService.class).to(TimeServiceImpl.class);
- bind( CassandraConfig.class ).to( CassandraConfigImpl.class );
+ bind(CassandraConfig.class).to(CassandraConfigImpl.class);
/**
* Data migration beans
*/
- bind( MigrationInfoSerialization.class ).to( MigrationInfoSerializationImpl.class );
+ bind(MigrationInfoSerialization.class).to(MigrationInfoSerializationImpl.class);
- bind( DataMigrationManager.class ).to( DataMigrationManagerImpl.class );
+ bind(DataMigrationManager.class).to(DataMigrationManagerImpl.class);
- bind( MetricsFactory.class ).to( MetricsFactoryImpl.class );
+ bind(MetricsFactory.class).to(MetricsFactoryImpl.class);
- bind (MigrationInfoCache.class).to( MigrationInfoCacheImpl.class );
+ bind(MigrationInfoCache.class).to(MigrationInfoCacheImpl.class);
install(new GuicyFigModule(MetricsFig.class));
//do multibindings for migrations
//create the empty multibinder so other plugins can use it
- Multibinder.newSetBinder( binder(), MigrationPlugin.class);
+ Multibinder.newSetBinder(binder(), MigrationPlugin.class);
/**
* RX java scheduler configuration
*/
- install ( new GuicyFigModule( RxSchedulerFig.class ));
+ install(new GuicyFigModule(RxSchedulerFig.class));
+ install(new GuicyFigModule(ClusterFig.class));
- bind( RxTaskScheduler.class).to( RxTaskSchedulerImpl.class );
+ bind(RxTaskScheduler.class).to(RxTaskSchedulerImpl.class);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
new file mode 100644
index 0000000..7e612b8
--- /dev/null
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
@@ -0,0 +1,38 @@
+/*
+ *
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. The ASF licenses this file to You
+ * * under the Apache License, Version 2.0 (the "License"); you may not
+ * * use this file except in compliance with the License.
+ * * You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License. For additional information regarding
+ * * copyright in this work, please see the NOTICE file in the top level
+ * * directory of this distribution.
+ *
+ */
+package org.apache.usergrid.persistence.core.guicyfig;
+
+import org.safehaus.guicyfig.Default;
+import org.safehaus.guicyfig.FigSingleton;
+import org.safehaus.guicyfig.GuicyFig;
+import org.safehaus.guicyfig.Key;
+
+/**
+ * Configuration for environment
+ */
+@FigSingleton
+public interface ClusterFig extends GuicyFig{
+
+ @Default( "ug" )
+ @Key( "elasticsearch.index_prefix" ) //"usergrid.cluster_name"
+ String getClusterNameInternal();
+ default String getClusterName(){return getClusterNameInternal().toLowerCase();}
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
index e00101b..cd565ae 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
@@ -37,8 +37,6 @@ public interface IndexLocationStrategy {
String getIndexRootName();
-
-
default String getIndexBucketName() {
return getIndexRootName();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/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 dc1a5ca..9ba127d 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
@@ -32,6 +32,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.queue.*;
import org.apache.usergrid.persistence.queue.Queue;
import org.apache.usergrid.persistence.queue.util.AmazonNotificationUtils;
@@ -49,6 +50,7 @@ public class SNSQueueManagerImpl implements QueueManager {
private final QueueScope scope;
private ObjectMapper mapper;
private final QueueFig fig;
+ private final ClusterFig clusterFig;
private final AmazonSQSClient sqs;
private final AmazonSNSClient sns;
@@ -100,9 +102,10 @@ public class SNSQueueManagerImpl implements QueueManager {
@Inject
- public SNSQueueManagerImpl(@Assisted QueueScope scope, QueueFig fig) {
+ public SNSQueueManagerImpl(@Assisted QueueScope scope, QueueFig fig, ClusterFig clusterFig) {
this.scope = scope;
this.fig = fig;
+ this.clusterFig = clusterFig;
try {
smileFactory.delegateToTextual(true);
@@ -205,7 +208,7 @@ public class SNSQueueManagerImpl implements QueueManager {
private String getName() {
- String name = fig.getPrefix() + "_" + scope.getName();
+ String name = clusterFig.getClusterName() + "_" + scope.getName();
Preconditions.checkArgument(name.length() <= 80, "Your name must be < than 80 characters");
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3f0b0a60/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
index e6f16c8..82836fd 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.ExecutionException;
+import org.apache.usergrid.persistence.core.guicyfig.ClusterFig;
import org.apache.usergrid.persistence.queue.util.AmazonNotificationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,6 +68,7 @@ public class SQSQueueManagerImpl implements QueueManager {
private final QueueScope scope;
private ObjectMapper mapper;
protected final QueueFig fig;
+ private final ClusterFig clusterFig;
protected final AmazonSQSClient sqs;
private static SmileFactory smileFactory = new SmileFactory();
@@ -133,10 +135,11 @@ public class SQSQueueManagerImpl implements QueueManager {
@Inject
- public SQSQueueManagerImpl(@Assisted QueueScope scope, final QueueFig fig) {
+ public SQSQueueManagerImpl(@Assisted QueueScope scope, final QueueFig fig, final ClusterFig clusterFig) {
this.scope = scope;
this.fig = fig;
+ this.clusterFig = clusterFig;
try {
smileFactory.delegateToTextual(true);
@@ -155,7 +158,7 @@ public class SQSQueueManagerImpl implements QueueManager {
protected String getName() {
- String name = fig.getPrefix() + "_" + scope.getName();
+ String name = clusterFig.getClusterName() + "_" + scope.getName();
Preconditions.checkArgument(name.length() <= 80, "Your name must be < than 80 characters");