usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [59/68] [abbrv] incubator-usergrid git commit: add hector settings for timeout and keep alive. enable HectorLockManagerImpl
Date Fri, 17 Apr 2015 22:48:04 GMT
add hector settings for timeout and keep alive. enable HectorLockManagerImpl


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/cdaabe3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/cdaabe3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/cdaabe3a

Branch: refs/heads/two-dot-o-dev
Commit: cdaabe3afca13cb5ca72f51b98c062bc0610d154
Parents: 6d962b7
Author: Yi Ding <yding37@gmail.com>
Authored: Wed Apr 15 16:13:15 2015 -0700
Committer: Yi Ding <yding37@gmail.com>
Committed: Wed Apr 15 16:13:15 2015 -0700

----------------------------------------------------------------------
 stack/config/src/main/resources/usergrid-default.properties | 6 ++++++
 stack/core/src/main/resources/usergrid-core-context.xml     | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cdaabe3a/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 cc4dda6..37acfc5 100644
--- a/stack/config/src/main/resources/usergrid-default.properties
+++ b/stack/config/src/main/resources/usergrid-default.properties
@@ -63,6 +63,12 @@ cassandra.mutation.flushsize=2000
 #Even numbers for RF can potentially case the locks to fail, via "split brain" when read
at QUORUM on lock verification
 cassandra.lock.keyspace=Locks
 
+# Timeout in ms before hector considers a thrift socket dead
+cassandra.thriftSocketTimeout=0
+# If hector should use host TCP keep alive settings
+cassandra.useSocketKeepalive=false
+
+
 # false to disable test features
 usergrid.test=false
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cdaabe3a/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml b/stack/core/src/main/resources/usergrid-core-context.xml
index 515d642..917ee9c 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -54,6 +54,8 @@
 		<constructor-arg value="${cassandra.url}" />
         <!-- set the pool size if it's available.  If not go with 50 -->
         <property name="maxActive" value="${cassandra.connections:20}"/>
+        <property name="cassandraThriftSocketTimeout" value="${cassandra.thriftSocketTimeout:0}"
/>
+        <property name="useSocketKeepalive" value="${cassandra.useSocketKeepalive:false}"
/>
         <property name="clockResolution" ref="microsecondsTimeResolution" />
         <property name="opTimer" ref="taggedOpTimer"/>
         <property name="loadBalancingPolicy" ref="loadBalancingPolicy"/>
@@ -70,16 +72,16 @@
     <bean id="loadBalancingPolicy" class="me.prettyprint.cassandra.connection.DynamicLoadBalancingPolicy"/>
 
 	<!--  locking for a single node -->	
-	<bean name="lockManager" class="org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl"
/>
+    <!-- <bean name="lockManager" class="org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl"
/> -->
 	
 	<!--  hector based locks -->
 	<!-- Note that if this is deployed in a production cluster, the RF on the keyspace MUST
be updated to use an odd number for it's replication Factor.
 		  Even numbers can potentially case the locks to fail, via "split brain" when read at QUORUM
on lock verification-->
 	
-	<!--  <bean name="lockManager" class="org.apache.usergrid.locking.cassandra.HectorLockManagerImpl"
>
+	<bean name="lockManager" class="org.apache.usergrid.locking.cassandra.HectorLockManagerImpl"
>
 		<property name="cluster" ref="cassandraCluster"/>
 		<property name="keyspaceName" value="${cassandra.lock.keyspace}"/>
-	</bean>-->
+	</bean>
 	
 	<!--  zookeeper locks -->
 	<!--


Mime
View raw message