Repository: usergrid Updated Branches: refs/heads/hotfix-2.0.0 9626b5ba8 -> 406e3c8e0
Disable the circuit breaker logic. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/406e3c8e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/406e3c8e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/406e3c8e Branch: refs/heads/hotfix-2.0.0 Commit: 406e3c8e05c8bb0e5a303a46de0e58d357c5b3e6 Parents: 9626b5b Author: Michael Russo <[email protected]> Authored: Tue Jun 21 10:22:34 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Jun 21 10:22:34 2016 -0700 ---------------------------------------------------------------------- .../persistence/core/hystrix/HystrixCassandra.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/406e3c8e/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java index 857f265..9078d98 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/hystrix/HystrixCassandra.java @@ -25,6 +25,7 @@ import com.netflix.astyanax.connectionpool.OperationResult; import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; import com.netflix.hystrix.HystrixCommand; import com.netflix.hystrix.HystrixCommandGroupKey; +import com.netflix.hystrix.HystrixCommandProperties; import com.netflix.hystrix.HystrixThreadPoolProperties; @@ -40,15 +41,17 @@ public class HystrixCassandra { * Command group used for realtime user commands */ public static final HystrixCommand.Setter - USER_GROUP = HystrixCommand.Setter.withGroupKey( HystrixCommandGroupKey.Factory.asKey( "user" ) ).andThreadPoolPropertiesDefaults( - HystrixThreadPoolProperties.Setter().withCoreSize( 300 ) ); + USER_GROUP = HystrixCommand.Setter.withGroupKey( HystrixCommandGroupKey.Factory.asKey( "user" ) ) + .andThreadPoolPropertiesDefaults( HystrixThreadPoolProperties.Setter().withCoreSize( 300 ) ) + .andCommandPropertiesDefaults( HystrixCommandProperties.Setter().withCircuitBreakerEnabled(false) ); /** * Command group for asynchronous operations */ public static final HystrixCommand.Setter - ASYNC_GROUP = HystrixCommand.Setter.withGroupKey( HystrixCommandGroupKey.Factory.asKey( "async" ) ).andThreadPoolPropertiesDefaults( - HystrixThreadPoolProperties.Setter().withCoreSize( 100 ) ); + ASYNC_GROUP = HystrixCommand.Setter.withGroupKey( HystrixCommandGroupKey.Factory.asKey( "async" ) ) + .andThreadPoolPropertiesDefaults( HystrixThreadPoolProperties.Setter().withCoreSize( 100 ) ) + .andCommandPropertiesDefaults( HystrixCommandProperties.Setter().withCircuitBreakerEnabled(false) ); /**
