You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/04/12 22:34:26 UTC
svn commit: r1467453 - in /accumulo/trunk: ./ assemble/ core/
core/src/main/java/org/apache/accumulo/core/client/mapred/
core/src/main/java/org/apache/accumulo/core/client/mapreduce/
core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util...
Author: kturner
Date: Fri Apr 12 20:34:25 2013
New Revision: 1467453
URL: http://svn.apache.org/r1467453
Log:
ACCUMULO-829 ACCUMULO-987 removed partially implemented feature to pass credentials to map reduce via file
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1467444
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1467444
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1467444
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java Fri Apr 12 20:34:25 2013
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.format.DefaultFormatter;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
@@ -38,8 +37,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)} OR {@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
- * <li>{@link AccumuloInputFormat#setInputTableName(JobConf, String)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloInputFormat#setMockInstance(JobConf, String)}
* </ul>
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java Fri Apr 12 20:34:25 2013
@@ -42,9 +42,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
-import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.OutputFormat;
@@ -93,23 +91,6 @@ public class AccumuloOutputFormat implem
}
/**
- * Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
- * the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
- * {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
- *
- * @param job
- * the Hadoop job instance to be configured
- * @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
- * authentication
- * @since 1.5.0
- */
- public static void setConnectorInfo(JobConf job, Path path) {
- OutputConfigurator.setConnectorInfo(CLASS, job, path);
- }
-
- /**
* Determines if the connector has been configured.
*
* @param job
@@ -117,7 +98,6 @@ public class AccumuloOutputFormat implem
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static Boolean isConnectorInfoSet(JobConf job) {
return OutputConfigurator.isConnectorInfoSet(CLASS, job);
@@ -131,7 +111,6 @@ public class AccumuloOutputFormat implem
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static String getPrincipal(JobConf job) {
return OutputConfigurator.getPrincipal(CLASS, job);
@@ -145,7 +124,6 @@ public class AccumuloOutputFormat implem
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static String getTokenClass(JobConf job) {
return OutputConfigurator.getTokenClass(CLASS, job);
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java Fri Apr 12 20:34:25 2013
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.PeekingIterator;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.InputSplit;
@@ -40,7 +39,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)} OR {@link AccumuloRowInputFormat#setConnectorInfo(JobConf, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String, AuthenticationToken)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf, Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloRowInputFormat#setMockInstance(JobConf, String)}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java Fri Apr 12 20:34:25 2013
@@ -59,8 +59,6 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.hadoop.filecache.DistributedCache;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.InputSplit;
@@ -106,23 +104,6 @@ public abstract class InputFormatBase<K,
}
/**
- * Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
- * the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
- * {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link CredentialHelper#asBase64String(TCredentials)}.
- *
- * @param job
- * the Hadoop job instance to be configured
- * @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
- * authentication
- * @since 1.5.0
- */
- public static void setConnectorInfo(JobConf job, Path path) {
- InputConfigurator.setConnectorInfo(CLASS, job, path);
- }
-
- /**
* Determines if the connector has been configured.
*
* @param job
@@ -130,7 +111,6 @@ public abstract class InputFormatBase<K,
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static Boolean isConnectorInfoSet(JobConf job) {
return InputConfigurator.isConnectorInfoSet(CLASS, job);
@@ -144,7 +124,6 @@ public abstract class InputFormatBase<K,
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static String getPrincipal(JobConf job) {
return InputConfigurator.getPrincipal(CLASS, job);
@@ -158,7 +137,6 @@ public abstract class InputFormatBase<K,
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(JobConf, String, AuthenticationToken)
- * @see #setConnectorInfo(JobConf, Path)
*/
protected static String getTokenClass(JobConf job) {
return InputConfigurator.getTokenClass(CLASS, job);
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java Fri Apr 12 20:34:25 2013
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.format.DefaultFormatter;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hadoop.mapreduce.Job;
@@ -38,7 +37,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, String, AuthenticationToken)}
* <li>{@link AccumuloInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloInputFormat#setMockInstance(Job, String)}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Fri Apr 12 20:34:25 2013
@@ -45,8 +45,6 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Job;
import org.apache.hadoop.mapreduce.JobContext;
@@ -65,7 +63,7 @@ import org.apache.log4j.Logger;
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloOutputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, String, AuthenticationToken)}
* <li>{@link AccumuloOutputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloOutputFormat#setMockInstance(Job, String)}
* </ul>
*
@@ -97,23 +95,6 @@ public class AccumuloOutputFormat extend
}
/**
- * Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
- * the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
- * {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
- *
- * @param job
- * the Hadoop job instance to be configured
- * @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
- * authentication
- * @since 1.5.0
- */
- public static void setConnectorInfo(Job job, Path path) {
- OutputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(), path);
- }
-
- /**
* Determines if the connector has been configured.
*
* @param context
@@ -121,7 +102,6 @@ public class AccumuloOutputFormat extend
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static Boolean isConnectorInfoSet(JobContext context) {
return OutputConfigurator.isConnectorInfoSet(CLASS, context.getConfiguration());
@@ -135,7 +115,6 @@ public class AccumuloOutputFormat extend
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static String getPrincipal(JobContext context) {
return OutputConfigurator.getPrincipal(CLASS, context.getConfiguration());
@@ -149,7 +128,6 @@ public class AccumuloOutputFormat extend
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static String getTokenClass(JobContext context) {
return OutputConfigurator.getTokenClass(CLASS, context.getConfiguration());
@@ -544,8 +522,8 @@ public class AccumuloOutputFormat extend
// ----------------------------------------------------------------------------------------------------
/**
- * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, AuthenticationToken)}, {@link #setConnectorInfo(Job, Path)},
- * {@link #setCreateTables(Job, boolean)}, and {@link #setDefaultTableName(Job, String)} instead.
+ * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String, AuthenticationToken)}, {@link #setCreateTables(Job, boolean)}, and
+ * {@link #setDefaultTableName(Job, String)} instead.
*/
@Deprecated
public static void setOutputInfo(Configuration conf, String user, byte[] passwd, boolean createTables, String defaultTable) {
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java Fri Apr 12 20:34:25 2013
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.PeekingIterator;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.InputFormat;
import org.apache.hadoop.mapreduce.InputSplit;
@@ -40,7 +39,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, AuthenticationToken)} OR {@link AccumuloRowInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, AuthenticationToken)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(Job, String, String)} OR {@link AccumuloRowInputFormat#setMockInstance(Job, String)}
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Fri Apr 12 20:34:25 2013
@@ -70,8 +70,6 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.InputFormat;
@@ -119,23 +117,6 @@ public abstract class InputFormatBase<K,
}
/**
- * Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
- * the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
- * {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link CredentialHelper#asBase64String(TCredentials)}.
- *
- * @param job
- * the Hadoop job instance to be configured
- * @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
- * authentication
- * @since 1.5.0
- */
- public static void setConnectorInfo(Job job, Path path) {
- InputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(), path);
- }
-
- /**
* Determines if the connector has been configured.
*
* @param context
@@ -143,7 +124,6 @@ public abstract class InputFormatBase<K,
* @return true if the connector has been configured, false otherwise
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static Boolean isConnectorInfoSet(JobContext context) {
return InputConfigurator.isConnectorInfoSet(CLASS, context.getConfiguration());
@@ -157,7 +137,6 @@ public abstract class InputFormatBase<K,
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static String getPrincipal(JobContext context) {
return InputConfigurator.getPrincipal(CLASS, context.getConfiguration());
@@ -171,7 +150,6 @@ public abstract class InputFormatBase<K,
* @return the user name
* @since 1.5.0
* @see #setConnectorInfo(Job, String, AuthenticationToken)
- * @see #setConnectorInfo(Job, Path)
*/
protected static String getTokenClass(JobContext context) {
return InputConfigurator.getTokenClass(CLASS, context.getConfiguration());
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java?rev=1467453&r1=1467452&r2=1467453&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java Fri Apr 12 20:34:25 2013
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client.mapreduce.lib.util;
-import java.net.URI;
import java.nio.charset.Charset;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -28,8 +27,6 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.util.StringUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -45,7 +42,7 @@ public class ConfiguratorBase {
* @since 1.5.0
*/
public static enum ConnectorInfo {
- IS_CONFIGURED, PRINCIPAL, TOKEN, CREDENTIALS_IN_CACHE_FILE, TOKEN_CLASS
+ IS_CONFIGURED, PRINCIPAL, TOKEN, TOKEN_CLASS
}
/**
@@ -111,33 +108,6 @@ public class ConfiguratorBase {
}
/**
- * Sets the connector information needed to communicate with Accumulo in this job. The authentication information will be read from the specified file when
- * the job runs. This prevents the user's token from being exposed on the Job Tracker web page. The specified path will be placed in the
- * {@link DistributedCache}, for better performance during job execution. Users can create the contents of this file using
- * {@link CredentialHelper#asBase64String(org.apache.accumulo.core.security.thrift.TCredentials)}.
- *
- * @param implementingClass
- * the class whose name will be used as a prefix for the property configuration key
- * @param conf
- * the Hadoop configuration object to configure
- * @param path
- * the path to a file in the configured file system, containing the serialized, base-64 encoded {@link AuthenticationToken} with the user's
- * authentication
- * @since 1.5.0
- */
- public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, Path path) {
- if (isConnectorInfoSet(implementingClass, conf))
- throw new IllegalStateException("Connector info for " + implementingClass.getSimpleName() + " can only be set once per job");
-
- ArgumentChecker.notNull(path);
- URI uri = path.toUri();
- conf.setBoolean(enumToConfKey(implementingClass, ConnectorInfo.IS_CONFIGURED), true);
- conf.setBoolean(enumToConfKey(implementingClass, ConnectorInfo.CREDENTIALS_IN_CACHE_FILE), true);
- DistributedCache.addCacheFile(uri, conf);
- conf.set(enumToConfKey(implementingClass, ConnectorInfo.PRINCIPAL), uri.getPath());
- }
-
- /**
* Determines if the connector info has already been set for this instance.
*
* @param implementingClass
@@ -147,7 +117,6 @@ public class ConfiguratorBase {
* @return true if the connector info has already been set, false otherwise
* @since 1.5.0
* @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
- * @see #setConnectorInfo(Class, Configuration, Path)
*/
public static Boolean isConnectorInfoSet(Class<?> implementingClass, Configuration conf) {
return conf.getBoolean(enumToConfKey(implementingClass, ConnectorInfo.IS_CONFIGURED), false);
@@ -163,7 +132,6 @@ public class ConfiguratorBase {
* @return the principal
* @since 1.5.0
* @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
- * @see #setConnectorInfo(Class, Configuration, Path)
*/
public static String getPrincipal(Class<?> implementingClass, Configuration conf) {
return conf.get(enumToConfKey(implementingClass, ConnectorInfo.PRINCIPAL));
@@ -179,7 +147,6 @@ public class ConfiguratorBase {
* @return the principal
* @since 1.5.0
* @see #setConnectorInfo(Class, Configuration, String, AuthenticationToken)
- * @see #setConnectorInfo(Class, Configuration, Path)
*/
public static String getTokenClass(Class<?> implementingClass, Configuration conf) {
return conf.get(enumToConfKey(implementingClass, ConnectorInfo.TOKEN_CLASS));
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1467444
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1467444
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1467444
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1467444
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1467444
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1467444