Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 801A918B10 for ; Wed, 14 Oct 2015 21:30:42 +0000 (UTC) Received: (qmail 85724 invoked by uid 500); 14 Oct 2015 21:30:39 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 85701 invoked by uid 500); 14 Oct 2015 21:30:39 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 85692 invoked by uid 99); 14 Oct 2015 21:30:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Oct 2015 21:30:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0752FE04C8; Wed, 14 Oct 2015 21:30:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Wed, 14 Oct 2015 21:30:39 -0000 Message-Id: In-Reply-To: <5d62a88abe064658b50abb20b8934068@git.apache.org> References: <5d62a88abe064658b50abb20b8934068@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] usergrid git commit: Lowers the default viability timeout to 10 seconds Lowers the default viability timeout to 10 seconds Changes retry count to 20. During this, we should hit the 10% read repair chance if we're missing data. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0f589f68 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0f589f68 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0f589f68 Branch: refs/heads/2.1-release Commit: 0f589f688ee72fe9db2b50e7af6604152cd898ff Parents: dbf37e4 Author: Todd Nine Authored: Wed Oct 14 14:27:42 2015 -0700 Committer: Todd Nine Committed: Wed Oct 14 14:27:42 2015 -0700 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/queue/QueueFig.java | 12 ++++++++++-- .../persistence/queue/util/AmazonNotificationUtils.java | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/0f589f68/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java index 66f8af4..7f26bcf 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueFig.java @@ -56,10 +56,10 @@ public interface QueueFig extends GuicyFig { String getDeadletterRetentionPeriod(); /** - * The maximum number of messages to deliver to a dead letter queue. + * The maximum number of attempts to attempt to deliver before failing into the DLQ */ @Key( "usergrid.queue.deliveryLimit" ) - @Default("5") + @Default("20") String getQueueDeliveryLimit(); @Key("usergrid.use.default.queue") @@ -74,4 +74,12 @@ public interface QueueFig extends GuicyFig { @Key("usergrid.queue.publish.queuesize") @Default("850000") int getAsyncQueueSize(); + + /** + * Set the visibility timeout for faster retries + * @return + */ + @Key( "usergrid.queue.visibilityTimeout" ) + @Default("10") + String getVisibilityTimeout(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/0f589f68/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java index c321715..6105592 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/util/AmazonNotificationUtils.java @@ -64,6 +64,7 @@ public class AmazonNotificationUtils { final Map queueAttributes = new HashMap<>( 2 ); queueAttributes.put( "MessageRetentionPeriod", fig.getRetentionPeriod() ); queueAttributes.put( "RedrivePolicy", redrivePolicy ); + queueAttributes.put( "VisibilityTimeout", fig.getVisibilityTimeout() ); CreateQueueRequest createQueueRequest = new CreateQueueRequest(). withQueueName( queueName )