Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C3F0105D3 for ; Fri, 27 Sep 2013 17:41:23 +0000 (UTC) Received: (qmail 14563 invoked by uid 500); 27 Sep 2013 17:41:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13784 invoked by uid 500); 27 Sep 2013 17:41:10 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 13494 invoked by uid 99); 27 Sep 2013 17:41:07 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 17:41:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6BB8E90C3B4; Fri, 27 Sep 2013 17:41:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Fri, 27 Sep 2013 17:41:07 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-1740 no idea why this fixes the hangs we've seen Updated Branches: refs/heads/master acba59b16 -> 9ac95f869 ACCUMULO-1740 no idea why this fixes the hangs we've seen Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5e5b2bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5e5b2bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5e5b2bc Branch: refs/heads/master Commit: e5e5b2bc39be0c500e18880d7e1821f2903bfb2d Parents: acba59b Author: Eric Newton Authored: Fri Sep 27 13:40:08 2013 -0400 Committer: Eric Newton Committed: Fri Sep 27 13:40:08 2013 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/tabletserver/TabletServer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5e5b2bc/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index ce22534..575d7e7 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -66,6 +66,8 @@ import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.CompressedIterators; import org.apache.accumulo.core.client.impl.CompressedIterators.IterConfig; +import org.apache.accumulo.core.client.impl.Translator.TKeyExtentTranslator; +import org.apache.accumulo.core.client.impl.Translator.TRangeTranslator; import org.apache.accumulo.core.client.impl.ScannerImpl; import org.apache.accumulo.core.client.impl.TabletType; import org.apache.accumulo.core.client.impl.Translator; @@ -1325,8 +1327,8 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu for (ByteBuffer auth : authorizations) if (!userauths.contains(ByteBufferUtil.toBytes(auth))) throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.BAD_AUTHORIZATIONS); - - Map> batch = Translator.translate(tbatch, Translator.TKET, new Translator.ListTranslator(Translator.TRT)); + + Map> batch = Translator.translate(tbatch, new TKeyExtentTranslator(), new Translator.ListTranslator(new TRangeTranslator())); // This is used to determine which thread pool to use KeyExtent threadPoolExtent = batch.keySet().iterator().next();