You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sk...@apache.org on 2018/10/02 13:16:44 UTC
hadoop git commit: YARN-8785. Improve the error message when a bind
mount is not whitelisted. Contributed by Simon Prewo
Repository: hadoop
Updated Branches:
refs/heads/trunk 6fab6886f -> 5edb9d3b9
YARN-8785. Improve the error message when a bind mount is not whitelisted. Contributed by Simon Prewo
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5edb9d3b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5edb9d3b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5edb9d3b
Branch: refs/heads/trunk
Commit: 5edb9d3b972ad51e23b9cac7928b38876068a463
Parents: 6fab688
Author: Shane Kumpf <sk...@apache.org>
Authored: Tue Oct 2 07:16:29 2018 -0600
Committer: Shane Kumpf <sk...@apache.org>
Committed: Tue Oct 2 07:16:29 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/5edb9d3b/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 ee80798..69f27ba 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org