accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] accumulo git commit: ACCUMULO-3704 Provide the correct client conf to the TabletLocator
Date Wed, 01 Apr 2015 22:07:41 GMT
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 <elserj@apache.org>
Authored: Wed Apr 1 16:26:20 2015 -0400
Committer: Josh Elser <elserj@apache.org>
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));
   }
 


Mime
View raw message