Author: tucu
Date: Wed Jul 24 22:31:31 2013
New Revision: 1506758
URL: http://svn.apache.org/r1506758
Log:
MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via
tucu)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1506758&r1=1506757&r2=1506758&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Wed Jul 24
22:31:31 2013
@@ -654,6 +654,9 @@ Release 2.1.0-beta - 2013-07-02
MAPREDUCE-5310. MRAM should not normalize allocation request capabilities.
(tucu)
+ MAPREDUCE-5213. Re-assess TokenCache methods marked @Private.
+ (kkambatl via tucu)
+
Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java?rev=1506758&r1=1506757&r2=1506758&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
Wed Jul 24 22:31:31 2013
@@ -159,11 +159,14 @@ public class TokenCache {
/**
* load job token from a file
+ * @deprecated Use {@link Credentials#readTokenStorageFile} instead,
+ * this method is included for compatibility against Hadoop-1.
* @param conf
* @throws IOException
*/
@InterfaceAudience.Private
- public static Credentials loadTokens(String jobTokenFile, JobConf conf)
+ @Deprecated
+ public static Credentials loadTokens(String jobTokenFile, JobConf conf)
throws IOException {
Path localJobTokenFile = new Path ("file:///" + jobTokenFile);
@@ -180,11 +183,13 @@ public class TokenCache {
/**
* load job token from a file
- *
+ * @deprecated Use {@link Credentials#readTokenStorageFile} instead,
+ * this method is included for compatibility against Hadoop-1.
* @param conf
* @throws IOException
*/
@InterfaceAudience.Private
+ @Deprecated
public static Credentials loadTokens(String jobTokenFile, Configuration conf)
throws IOException {
return loadTokens(jobTokenFile, new JobConf(conf));
@@ -220,10 +225,13 @@ public class TokenCache {
}
/**
- *
+ * @deprecated Use {@link Credentials#getToken(org.apache.hadoop.io.Text)}
+ * instead, this method is included for compatibility against Hadoop-1
* @param namenode
* @return delegation token
*/
+ @InterfaceAudience.Private
+ @Deprecated
public static
Token<?> getDelegationToken(
Credentials credentials, String namenode) {
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java?rev=1506758&r1=1506757&r2=1506758&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
Wed Jul 24 22:31:31 2013
@@ -170,6 +170,7 @@ public class TestTokenCache {
assertNull(conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY));
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetTokensForNamenodes() throws IOException,
URISyntaxException {
