Author: suresh
Date: Sat Apr 20 20:01:16 2013
New Revision: 1470222
URL: http://svn.apache.org/r1470222
Log:
HADOOP-9480. Windows installer should pick the config from
src\packages\win\template\conf. Contributed by Ivan Mitic.
Modified:
hadoop/common/branches/branch-1-win/src/packages/win/scripts/InstallApi.psm1
hadoop/common/branches/branch-1-win/src/packages/win/template/conf/log4j.properties
Modified:
hadoop/common/branches/branch-1-win/src/packages/win/scripts/InstallApi.psm1
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/packages/win/scripts/InstallApi.psm1?rev=1470222&r1=1470221&r2=1470222&view=diff
==============================================================================
---
hadoop/common/branches/branch-1-win/src/packages/win/scripts/InstallApi.psm1
(original)
+++
hadoop/common/branches/branch-1-win/src/packages/win/scripts/InstallApi.psm1
Sat Apr 20 20:01:16 2013
@@ -193,7 +193,7 @@ function InstallCore(
$xcopy_cmd = "xcopy /EIYF `"$HDP_INSTALL_PATH\..\template\conf\*.xml`"
`"$hadoopInstallToDir\conf`""
Invoke-CmdChk $xcopy_cmd
- $xcopy_cmd = "xcopy /EIYF
`"$HDP_INSTALL_PATH\..\template\conf\*.properties`" `"$hadoopInstallToDir\bin`""
+ $xcopy_cmd = "xcopy /EIYF
`"$HDP_INSTALL_PATH\..\template\conf\*.properties`"
`"$hadoopInstallToDir\conf`""
Invoke-CmdChk $xcopy_cmd
$xcopy_cmd = "xcopy /EIYF `"$HDP_INSTALL_PATH\..\template\bin`"
`"$hadoopInstallToDir\bin`""
Modified:
hadoop/common/branches/branch-1-win/src/packages/win/template/conf/log4j.properties
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/packages/win/template/conf/log4j.properties?rev=1470222&r1=1470221&r2=1470222&view=diff
==============================================================================
---
hadoop/common/branches/branch-1-win/src/packages/win/template/conf/log4j.properties
(original)
+++
hadoop/common/branches/branch-1-win/src/packages/win/template/conf/log4j.properties
Sat Apr 20 20:01:16 2013
@@ -21,6 +21,15 @@ hadoop.root.logger=INFO,console
hadoop.log.dir=.
hadoop.log.file=hadoop.log
+#
+# Job Summary Appender
+#
+# Use following logger to send summary to separate file defined by
+# hadoop.mapreduce.jobsummary.log.file rolled daily:
+# hadoop.mapreduce.jobsummary.logger=INFO,JSA
+#
+hadoop.mapreduce.jobsummary.logger=${hadoop.root.logger}
+hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
# Define the root logger to the system property "hadoop.root.logger".
log4j.rootLogger=${hadoop.root.logger}, EventCounter
@@ -81,38 +90,15 @@ log4j.appender.TLA.layout.ConversionPatt
#
#Security audit appender
#
-hadoop.security.logger=INFO,console
-log4j.category.SecurityLogger=${hadoop.security.logger}
hadoop.security.log.file=SecurityAuth.audit
log4j.appender.DRFAS=org.apache.log4j.DailyRollingFileAppender
log4j.appender.DRFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}
+
log4j.appender.DRFAS.layout=org.apache.log4j.PatternLayout
log4j.appender.DRFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-log4j.appender.DRFAS.DatePattern=.yyyy-MM-dd
-
-#
-# hdfs audit logging
-#
-hdfs.audit.logger=INFO,console
-log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=${hdfs.audit.logger}
-log4j.additivity.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=false
-log4j.appender.DRFAAUDIT=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFAAUDIT.File=${hadoop.log.dir}/hdfs-audit.log
-log4j.appender.DRFAAUDIT.layout=org.apache.log4j.PatternLayout
-log4j.appender.DRFAAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
-log4j.appender.DRFAAUDIT.DatePattern=.yyyy-MM-dd
-
-#
-# mapred audit logging
-#
-mapred.audit.logger=INFO,console
-log4j.logger.org.apache.hadoop.mapred.AuditLogger=${mapred.audit.logger}
-log4j.additivity.org.apache.hadoop.mapred.AuditLogger=false
-log4j.appender.MRAUDIT=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MRAUDIT.File=${hadoop.log.dir}/mapred-audit.log
-log4j.appender.MRAUDIT.layout=org.apache.log4j.PatternLayout
-log4j.appender.MRAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n
-log4j.appender.MRAUDIT.DatePattern=.yyyy-MM-dd
+#new logger
+log4j.logger.SecurityLogger=OFF,console
+log4j.logger.SecurityLogger.additivity=false
#
# Rolling File Appender
@@ -129,6 +115,11 @@ log4j.appender.MRAUDIT.DatePattern=.yyyy
#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} - %m%n
#log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2}
(%F:%M(%L)) - %m%n
+#
+# FSNamesystem Audit logging
+# All audit events are logged at INFO level
+#
+log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=WARN
# Custom Logging levels
@@ -154,14 +145,8 @@ log4j.appender.NullAppender=org.apache.l
log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter
#
-# Job Summary Appender
+# Job Summary Appender
#
-# Use following logger to send summary to separate file defined by
-# hadoop.mapreduce.jobsummary.log.file rolled daily:
-# hadoop.mapreduce.jobsummary.logger=INFO,JSA
-#
-hadoop.mapreduce.jobsummary.logger=INFO,JSA
-hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
log4j.appender.JSA=org.apache.log4j.DailyRollingFileAppender
log4j.appender.JSA.File=${hadoop.log.dir}/${hadoop.mapreduce.jobsummary.log.file}
log4j.appender.JSA.layout=org.apache.log4j.PatternLayout
