Repository: hadoop Updated Branches: refs/heads/branch-2 25be97808 -> ee25c0d89
YARN-2891. Failed Container Executor does not provide a clear error message. Contributed by Dustin Cote. (harsh) (cherry picked from commit 4b13318dea7a1cbbbfc1f84207af829cbe2f720e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ee25c0d8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ee25c0d8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ee25c0d8 Branch: refs/heads/branch-2 Commit: ee25c0d8906be457f69edae5a9ee940534af3a89 Parents: 25be978 Author: Harsh J <[email protected]> Authored: Thu Dec 4 03:16:08 2014 +0530 Committer: Harsh J <[email protected]> Committed: Thu Dec 4 03:19:01 2014 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/main/native/container-executor/impl/container-executor.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee25c0d8/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b67af7f..b8daae9 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -29,6 +29,9 @@ Release 2.7.0 - UNRELEASED IMPROVEMENTS + YARN-2891. Failed Container Executor does not provide a clear error + message. (Dustin Cote via harsh) + YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Vinod Kumar Vavilapalli and Tsuyoshi OZAWA via junping_du) http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee25c0d8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c index 9af9161..4fc78b6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/container-executor.c @@ -526,7 +526,7 @@ int check_dir(char* npath, mode_t st_mode, mode_t desired, int finalComponent) { int filePermInt = st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); int desiredInt = desired & (S_IRWXU | S_IRWXG | S_IRWXO); if (filePermInt != desiredInt) { - fprintf(LOGFILE, "Path %s does not have desired permission.\n", npath); + fprintf(LOGFILE, "Path %s has permission %o but needs permission %o.\n", npath, filePermInt, desiredInt); return -1; } }
