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 7078C179D0 for ; Wed, 1 Apr 2015 22:07:40 +0000 (UTC) Received: (qmail 43197 invoked by uid 500); 1 Apr 2015 22:07:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 43156 invoked by uid 500); 1 Apr 2015 22:07:40 -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 43147 invoked by uid 99); 1 Apr 2015 22:07:40 -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, 01 Apr 2015 22:07:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 18F1BE10A2; Wed, 1 Apr 2015 22:07:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Wed, 01 Apr 2015 22:07:41 -0000 Message-Id: <7a556af6dabe4af2be45305d3d1fcab0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] accumulo git commit: ACCUMULO-3704 Provide the correct client conf to the TabletLocator ACCUMULO-3704 Provide the correct client conf to the TabletLocator TabletLocator doesn't use the client conf from the client context presently, but this should help to ensure that we don't run into a regression in the future if that changes. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91c297fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91c297fa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91c297fa Branch: refs/heads/master Commit: 91c297fa34827ec7a3fd6bd7cf8383f1af3dfb26 Parents: 579a3fa Author: Josh Elser Authored: Wed Apr 1 16:26:20 2015 -0400 Committer: Josh Elser Committed: Wed Apr 1 16:26:20 2015 -0400 ---------------------------------------------------------------------- .../core/client/mapreduce/lib/impl/InputConfigurator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/91c297fa/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java index e7af1ae..b0360fa 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/impl/InputConfigurator.java @@ -612,8 +612,9 @@ public class InputConfigurator extends ConfiguratorBase { if ("MockInstance".equals(instanceType)) return new MockTabletLocator(); Instance instance = getInstance(implementingClass, conf); + ClientConfiguration clientConf = getClientConfiguration(implementingClass, conf); ClientContext context = new ClientContext(instance, - new Credentials(getPrincipal(implementingClass, conf), getAuthenticationToken(implementingClass, conf)), ClientConfiguration.loadDefault()); + new Credentials(getPrincipal(implementingClass, conf), getAuthenticationToken(implementingClass, conf)), clientConf); return TabletLocator.getLocator(context, new Text(tableId)); }