Gage has uploaded a new change for review. https://gerrit.wikimedia.org/r/157311
Change subject: Hadoop: GELF: update env vars per upstream ...................................................................... Hadoop: GELF: update env vars per upstream Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c --- M templates/hadoop/hadoop-env.sh.erb 1 file changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh refs/changes/11/157311/1 diff --git a/templates/hadoop/hadoop-env.sh.erb b/templates/hadoop/hadoop-env.sh.erb index 8384e55..7459516 100644 --- a/templates/hadoop/hadoop-env.sh.erb +++ b/templates/hadoop/hadoop-env.sh.erb @@ -9,9 +9,8 @@ <% end -%> <% if @gelf_logging_enabled -%> <%# For logging to logstash via gelf, per http://www.paluch.biz/blog/95-logging-hadoop-messages-into-logstash-using-logstash-gelf.html -%> -<%# in the example this is the only HADOOP_*_OPTS var which is exported, is this deviance needed? -%> -<%# example: export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf -Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_NAMENODE_OPTS" -%> -export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,gelf -Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS" +export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=INFO,RFAS,gelf -Dhdfs.audit.logger=INFO,gelf $HADOOP_NAMENODE_OPTS" +export HADOOP_SECONDARYNAMENODE_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf -Dhdfs.audit.logger=INFO,DRFAAUDIT,gelf $HADOOP_SECONDARYNAMENODE_OPTS" <% end -%> <% if @datanode_jmxremote_port -%> @@ -20,18 +19,17 @@ <% end -%> <% if @gelf_logging_enabled -%> -<%# The example sets the default level to ERROR even though they do INFO for NAMENODE, interesting. -%> -<%# example: HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf $HADOOP_DATANODE_OPTS" -%> -HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=INFO,gelf $HADOOP_DATANODE_OPTS" +HADOOP_JOBTRACKER_OPTS="-Dhadoop.security.logger=INFO,DRFAS,gelf -Dmapred.audit.logger=INFO,MRAUDIT,gelf -Dmapred.jobsummary.logger=INFO,JSA,gelf $HADOOP_JOBTRACKER_OPTS" +HADOOP_TASKTRACKER_OPTS="-Dhadoop.security.logger=ERROR,console,gelf -Dmapred.audit.logger=ERROR,console,gelf $HADOOP_TASKTRACKER_OPTS" +<%# Upstream sets the default level to ERROR to avoid logging every successful auth -%> +HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,DRFAS,gelf $HADOOP_DATANODE_OPTS" -<%# example: export YARN_ROOT_LOGGER=INFO,DRFA,gelf -%> -export YARN_ROOT_LOGGER=INFO,RFA,gelf -<%# example: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%> -export HADOOP_ROOT_LOGGER=INFO,RFA,gelf -<%# example: export HADOOP_JHS_LOGGER=INFO,JSA,gelf -%> -export HADOOP_JHS_LOGGER=INFO,RFA,gelf -<%# example: export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf -%> -export HADOOP_ROOT_SECURITY_LOGGER=INFO,RFA,gelf +export YARN_ROOT_LOGGER=INFO,DRFA,gelf +<%# upstream: export HADOOP_ROOT_LOGGER=INFO,DRFA,gelf -%> +<%# causes error: java.io.FileNotFoundException: /usr/lib/hadoop/logs/hadoop.log (No such file or directory) -%> +export HADOOP_ROOT_LOGGER=INFO,console,gelf +export HADOOP_JHS_LOGGER=INFO,JSA,gelf +export HADOOP_ROOT_SECURITY_LOGGER=INFO,DRFAS,gelf <% end -%> <% if @hadoop_heapsize -%> -- To view, visit https://gerrit.wikimedia.org/r/157311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17973b4c11fea7044716741b2f6cab1eb097a85c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/cdh Gerrit-Branch: master Gerrit-Owner: Gage <jger...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
