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

MAPREDUCE-6100. replace mapreduce.job.credentials.binary with MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability. Contributed by Zhihai Xu. 

(cherry picked from commit f222bde273)
This commit is contained in:
Harsh J 2015-03-17 11:06:35 +05:30
parent cbb8858367
commit 5e403e8b8d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,10 @@ Release 2.8.0 - UNRELEASED
IMPROVEMENTS
MAPREDUCE-6100. replace "mapreduce.job.credentials.binary" with
MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY for better readability.
(Zhihai Xu via harsh)
MAPREDUCE-6105. Inconsistent configuration in property
mapreduce.reduce.shuffle.merge.percent. (Ray Chiang via harsh)

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
View File

@ -383,7 +383,7 @@ class JobSubmitter {
throws IOException {
// add tokens and secrets coming from a token storage file
String binaryTokenFilename =
conf.get("mapreduce.job.credentials.binary");
conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY);
if (binaryTokenFilename != null) {
Credentials binary = Credentials.readTokenStorageFile(
FileSystem.getLocal(conf).makeQualified(