big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu)

Browse Source
This commit is contained in:
Alejandro Abdelnur 2014-09-09 22:19:42 -07:00
parent 9ee891aa90
commit b100949404
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,6 +779,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu)
HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile
as binary file but set it to the configuration as JSON file. (zxu via tucu)
Release 2.5.1 - UNRELEASED Release 2.5.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
View File

@ -332,7 +332,7 @@ private void processGeneralOptions(Configuration conf,
} }
UserGroupInformation.getCurrentUser().addCredentials( UserGroupInformation.getCurrentUser().addCredentials(
Credentials.readTokenStorageFile(p, conf)); Credentials.readTokenStorageFile(p, conf));
conf.set("mapreduce.job.credentials.json", p.toString(), conf.set("mapreduce.job.credentials.binary", p.toString(),
"from -tokenCacheFile command line option"); "from -tokenCacheFile command line option");
} }

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestGenericOptionsParser.java
View File

@ -249,7 +249,7 @@ public void testTokenCacheOption() throws IOException {
creds.writeTokenStorageFile(tmpPath, conf); creds.writeTokenStorageFile(tmpPath, conf);
new GenericOptionsParser(conf, args); new GenericOptionsParser(conf, args);
String fileName = conf.get("mapreduce.job.credentials.json"); String fileName = conf.get("mapreduce.job.credentials.binary");
assertNotNull("files is null", fileName); assertNotNull("files is null", fileName);
assertEquals("files option does not match", tmpPath.toString(), fileName); assertEquals("files option does not match", tmpPath.toString(), fileName);