Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1506758 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2013-07-24 22:31:31 +00:00
parent 9c453d4432
commit c43c763151
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -654,6 +654,9 @@ Release 2.1.0-beta - 2013-07-02
MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. MAPREDUCE-5310. MRAM should not normalize allocation request capabilities.
(tucu) (tucu)
MAPREDUCE-5213. Re-assess TokenCache methods marked @Private.
(kkambatl via tucu)
Release 2.0.5-alpha - 06/06/2013 Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
View File

@ -159,10 +159,13 @@ public class TokenCache {
/** /**
* load job token from a file * load job token from a file
* @deprecated Use {@link Credentials#readTokenStorageFile} instead,
* this method is included for compatibility against Hadoop-1.
* @param conf * @param conf
* @throws IOException * @throws IOException
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
@Deprecated
public static Credentials loadTokens(String jobTokenFile, JobConf conf) public static Credentials loadTokens(String jobTokenFile, JobConf conf)
throws IOException { throws IOException {
Path localJobTokenFile = new Path ("file:///" + jobTokenFile); Path localJobTokenFile = new Path ("file:///" + jobTokenFile);
@ -180,11 +183,13 @@ public class TokenCache {
/** /**
* load job token from a file * load job token from a file
* * @deprecated Use {@link Credentials#readTokenStorageFile} instead,
* this method is included for compatibility against Hadoop-1.
* @param conf * @param conf
* @throws IOException * @throws IOException
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
@Deprecated
public static Credentials loadTokens(String jobTokenFile, Configuration conf) public static Credentials loadTokens(String jobTokenFile, Configuration conf)
throws IOException { throws IOException {
return loadTokens(jobTokenFile, new JobConf(conf)); 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 * @param namenode
* @return delegation token * @return delegation token
*/ */
@InterfaceAudience.Private
@Deprecated
public static public static
Token<?> getDelegationToken( Token<?> getDelegationToken(
Credentials credentials, String namenode) { Credentials credentials, String namenode) {

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
View File

@ -170,6 +170,7 @@ public class TestTokenCache {
assertNull(conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY)); assertNull(conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY));
} }
@SuppressWarnings("deprecation")
@Test @Test
public void testGetTokensForNamenodes() throws IOException, public void testGetTokensForNamenodes() throws IOException,
URISyntaxException { URISyntaxException {