From 5edb9d3b972ad51e23b9cac7928b38876068a463 Mon Sep 17 00:00:00 2001 From: Shane Kumpf Date: Tue, 2 Oct 2018 07:16:29 -0600 Subject: [PATCH] YARN-8785. Improve the error message when a bind mount is not whitelisted. Contributed by Simon Prewo --- .../main/native/container-executor/impl/utils/docker-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ee80798e777..69f27ba661f 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 @@ -1225,7 +1225,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 { @@ -1245,7 +1245,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; }