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

svn merge -c 1596310 FIXES: YARN-2050. Fix LogCLIHelpers to create the correct FileContext. Contributed by Ming Ma 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596311 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2014-05-20 16:21:30 +00:00
parent fd6d5121e3
commit dfd4a7398b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,9 @@ Release 2.5.0 - UNRELEASED
YARN-2042. String shouldn't be compared using == in YARN-2042. String shouldn't be compared using == in
QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza) QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza)
YARN-2050. Fix LogCLIHelpers to create the correct FileContext (Ming Ma
via jlowe)
Release 2.4.1 - UNRELEASED Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java
View File

@ -109,7 +109,10 @@ public class LogCLIHelpers implements Configurable {
remoteRootLogDir, appId, user, logDirSuffix); remoteRootLogDir, appId, user, logDirSuffix);
RemoteIterator<FileStatus> nodeFiles; RemoteIterator<FileStatus> nodeFiles;
try { try {
nodeFiles = FileContext.getFileContext().listStatus(remoteAppLogDir); Path qualifiedLogDir =
FileContext.getFileContext(getConf()).makeQualified(remoteAppLogDir);
nodeFiles = FileContext.getFileContext(qualifiedLogDir.toUri(),
getConf()).listStatus(remoteAppLogDir);
} catch (FileNotFoundException fnf) { } catch (FileNotFoundException fnf) {
System.out.println("Logs not available at " + remoteAppLogDir.toString()); System.out.println("Logs not available at " + remoteAppLogDir.toString());
System.out System.out