Repository: bigtop Updated Branches: refs/heads/master 0a2283ad5 -> a66540ef5
BIGTOP-1684: Make container executor configurable Make options for container executor configurable and work around the executor crashing at startup if banned_users is not set at all. See https://issues.apache.org/jira/browse/YARN-2847. Also synchronise yarn.nodemanager.linux-container-executor.group setting in yarn-site.xml with what's actually used in the filesystem and container-executor.cfg. Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/a66540ef Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/a66540ef Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/a66540ef Branch: refs/heads/master Commit: a66540ef5ca56d940d9c71d5fa8dcfb64eaac671 Parents: 0a2283a Author: Michael Weiser <[email protected]> Authored: Thu Feb 19 17:17:46 2015 +0100 Committer: Konstantin Boudnik <[email protected]> Committed: Mon Mar 2 17:30:19 2015 -0800 ---------------------------------------------------------------------- bigtop-deploy/puppet/modules/hadoop/manifests/init.pp | 3 +++ .../puppet/modules/hadoop/templates/container-executor.cfg | 8 ++++++-- bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/a66540ef/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp index a3c94db..0025a2a 100644 --- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp @@ -80,6 +80,9 @@ class hadoop ($hadoop_security_authentication = "simple", $yarn_resourcemanager_ha_enabled = undef, $yarn_resourcemanager_cluster_id = "ha-rm-uri", $yarn_resourcemanager_zk_address = $hadoop::zk, + # work around https://issues.apache.org/jira/browse/YARN-2847 by default + $container_executor_banned_users = "doesnotexist", + $container_executor_min_user_id = "499", $hadoop_security_authentication = $hadoop::hadoop_security_authentication, $kerberos_realm = $hadoop::kerberos_realm, ) inherits hadoop { http://git-wip-us.apache.org/repos/asf/bigtop/blob/a66540ef/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg b/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg index 4cabe8c..c4b64c5 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg +++ b/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg @@ -1,3 +1,7 @@ yarn.nodemanager.linux-container-executor.group=yarn -#banned.users=foo,bar -min.user.id=499 +<% if @container_executor_banned_users -%> +banned.users=<%= @container_executor_banned_users %> +<% end -%> +<% if @container_executor_banned_users -%> +min.user.id=<%= @container_executor_min_user_id %> +<% end -%> http://git-wip-us.apache.org/repos/asf/bigtop/blob/a66540ef/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml index 2c90907..27bc566 100644 --- a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml +++ b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml @@ -53,7 +53,7 @@ </property> <property> <name>yarn.nodemanager.linux-container-executor.group</name> - <value>hadoop</value> + <value>yarn</value> </property> <% end %>
