USERGRID-507 - Increase hystrix timeout for WriteUniqueVerify.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f723f36d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f723f36d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f723f36d Branch: refs/heads/usergrid-1268-akka-211 Commit: f723f36dfbdb1ad70171d2d0ddab11b2303cf03e Parents: 3a96239 Author: Michael Russo <[email protected]> Authored: Wed May 11 14:04:54 2016 +0800 Committer: Michael Russo <[email protected]> Committed: Wed May 11 14:04:54 2016 +0800 ---------------------------------------------------------------------- .../collection/mvcc/stage/write/WriteUniqueVerify.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f723f36d/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java index d05f838..2c47bdb 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.netflix.hystrix.HystrixCommandProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,6 +69,8 @@ public class WriteUniqueVerify implements Action1<CollectionIoEvent<MvccEntity>> public static int uniqueVerifyPoolSize = 100; + private static int uniqueVerifyTimeoutMillis= 5000; + protected final SerializationFig serializationFig; protected final Keyspace keyspace; @@ -221,8 +224,10 @@ public class WriteUniqueVerify implements Action1<CollectionIoEvent<MvccEntity>> /** * Command group used for realtime user commands */ - public static final HystrixCommand.Setter - REPLAY_GROUP = HystrixCommand.Setter.withGroupKey( - HystrixCommandGroupKey.Factory.asKey( "uniqueVerify" ) ).andThreadPoolPropertiesDefaults( - HystrixThreadPoolProperties.Setter().withCoreSize( uniqueVerifyPoolSize ) ); + private static final HystrixCommand.Setter + REPLAY_GROUP = HystrixCommand.Setter.withGroupKey( HystrixCommandGroupKey.Factory.asKey( "uniqueVerify" ) ) + .andThreadPoolPropertiesDefaults( + HystrixThreadPoolProperties.Setter().withCoreSize( uniqueVerifyPoolSize ) ) + .andCommandPropertiesDefaults( + HystrixCommandProperties.Setter().withExecutionTimeoutInMilliseconds(uniqueVerifyTimeoutMillis)); }
