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 CC65C178D9 for ; Tue, 10 Mar 2015 21:12:00 +0000 (UTC) Received: (qmail 59198 invoked by uid 500); 10 Mar 2015 21:12:00 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 59136 invoked by uid 500); 10 Mar 2015 21:12:00 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 59084 invoked by uid 99); 10 Mar 2015 21:12:00 -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; Tue, 10 Mar 2015 21:12:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3EBB2E187B; Tue, 10 Mar 2015 21:12:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Tue, 10 Mar 2015 21:12:02 -0000 Message-Id: <59140f962e514c61823fc2efb9884ab7@git.apache.org> In-Reply-To: <4e1ec283e31941d98e796fb6abfb68c0@git.apache.org> References: <4e1ec283e31941d98e796fb6abfb68c0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/11] incubator-usergrid git commit: change timer for buffer consumer change timer for buffer consumer Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5cc521f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5cc521f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5cc521f4 Branch: refs/heads/USERGRID-405 Commit: 5cc521f472699633a8a8cb3006c79ab5da15f632 Parents: d901d38 Author: Shawn Feldman Authored: Mon Mar 9 12:46:48 2015 -0600 Committer: Shawn Feldman Committed: Mon Mar 9 12:46:48 2015 -0600 ---------------------------------------------------------------------- .../persistence/index/impl/EsIndexBufferConsumerImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5cc521f4/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java index d952d78..efde88f 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexBufferConsumerImpl.java @@ -88,18 +88,17 @@ public class EsIndexBufferConsumerImpl implements IndexBufferConsumer { List drainList = new ArrayList<>(config.getIndexBufferSize() + 1); do { try { - Timer.Context timer = produceTimer.time(); IndexOperationMessage polled = producerQueue.poll(config.getIndexBufferTimeout(), TimeUnit.MILLISECONDS); if(polled!=null) { + Timer.Context timer = produceTimer.time(); drainList.add(polled); producerQueue.drainTo(drainList, config.getIndexBufferSize()); for(IndexOperationMessage drained : drainList){ subscriber.onNext(drained); } drainList.clear(); + timer.stop(); } - timer.stop(); - } catch (InterruptedException ie) { log.error("failed to dequeue", ie); }