Repository: hadoop Updated Branches: refs/heads/branch-3.1 65af98b58 -> adbc010d0
YARN-8785. Improve the error message when a bind mount is not whitelisted. Contributed by Simon Prewo (cherry picked from commit 5edb9d3b972ad51e23b9cac7928b38876068a463) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/adbc010d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/adbc010d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/adbc010d Branch: refs/heads/branch-3.1 Commit: adbc010d0fbc20bd426ec933b2acff366cfa6b9d Parents: 65af98b Author: Shane Kumpf <sku...@apache.org> Authored: Tue Oct 2 07:16:29 2018 -0600 Committer: Shane Kumpf <sku...@apache.org> Committed: Tue Oct 2 07:26:45 2018 -0600 ---------------------------------------------------------------------- .../src/main/native/container-executor/impl/utils/docker-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/adbc010d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c index 3884abf..e001754 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/impl/utils/docker-util.c @@ -1224,7 +1224,7 @@ static int add_mounts(const struct configuration *command_config, const struct c if (strncmp("rw", mount_type, 2) == 0) { // rw mount if (permitted_rw == 0) { - fprintf(ERRORFILE, "Invalid docker rw mount '%s', realpath=%s\n", values[i], mount_src); + fprintf(ERRORFILE, "Configuration does not allow docker mount '%s', realpath=%s\n", values[i], mount_src); ret = INVALID_DOCKER_RW_MOUNT; goto free_and_exit; } else { @@ -1244,7 +1244,7 @@ static int add_mounts(const struct configuration *command_config, const struct c } else { // ro mount if (permitted_ro == 0 && permitted_rw == 0) { - fprintf(ERRORFILE, "Invalid docker ro mount '%s', realpath=%s\n", values[i], mount_src); + fprintf(ERRORFILE, "Configuration does not allow docker mount '%s', realpath=%s\n", values[i], mount_src); ret = INVALID_DOCKER_RO_MOUNT; goto free_and_exit; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
