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/07/21 18:09:36 UTC
[4/6] incubator-usergrid git commit: USERGRID-870 - Expose a config
for the local datacenter name configured in Cassandra and make it available
to the Astyanax client.
USERGRID-870 - Expose a config for the local datacenter name configured in Cassandra and make it available to the Astyanax client.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4f88517d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4f88517d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4f88517d
Branch: refs/heads/two-dot-o-dev
Commit: 4f88517d0400cf3c2fb750332c9b147e5a3d0244
Parents: 800ce21
Author: Michael Russo <mi...@gmail.com>
Authored: Mon Jul 20 18:32:37 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Mon Jul 20 18:32:37 2015 -0700
----------------------------------------------------------------------
stack/config/src/main/resources/usergrid-default.properties | 4 ++++
.../persistence/core/astyanax/AstyanaxKeyspaceProvider.java | 1 +
.../apache/usergrid/persistence/core/astyanax/CassandraFig.java | 3 +++
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f88517d/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------
diff --git a/stack/config/src/main/resources/usergrid-default.properties b/stack/config/src/main/resources/usergrid-default.properties
index 80e5503..b239a77 100644
--- a/stack/config/src/main/resources/usergrid-default.properties
+++ b/stack/config/src/main/resources/usergrid-default.properties
@@ -76,6 +76,10 @@ cassandra.url=localhost:9160
#
#cassandra.system.keyspace=Usergrid
+# Set the value of the local data center configured in your cassandra deployment. If used, this
+# must exactly match the datacenter named used in Cassandra. Example 'us-west-2' or 'us-east-1'
+#
+#cassandra.datacenter.local=
# Set the Cassandra keyspaces to be used by Usergrid for storing data.
#
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f88517d/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
index 5172331..9377236 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
@@ -67,6 +67,7 @@ public class AstyanaxKeyspaceProvider implements Provider<Keyspace> {
ConnectionPoolConfiguration connectionPoolConfiguration =
new ConnectionPoolConfigurationImpl( "UsergridConnectionPool" )
.setPort( cassandraFig.getThriftPort() )
+ .setLocalDatacenter( cassandraFig.getLocalDataCenter() )
.setMaxConnsPerHost( cassandraFig.getConnections() )
.setSeeds( cassandraFig.getHosts() )
.setSocketTimeout( cassandraFig.getTimeout() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4f88517d/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
index 0426e37..0702185 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
@@ -63,6 +63,9 @@ public interface CassandraFig extends GuicyFig {
@Default( "9160" )
int getThriftPort();
+ @Key( "cassandra.datacenter.local" )
+ String getLocalDataCenter();
+
@Key( "cassandra.connections" )
@Default( "100" )
int getConnections();