hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1097966 - in /hadoop/common/branches/branch-0.20-security-203: CHANGES.txt conf/hadoop-metrics2.properties conf/hadoop-metrics2.properties.example conf/log4j.properties src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
Date Fri, 29 Apr 2011 21:57:15 GMT
Author: omalley
Date: Fri Apr 29 21:57:15 2011
New Revision: 1097966

URL: http://svn.apache.org/viewvc?rev=1097966&view=rev
Log:
HADOOP-7253. Update the default configuration to fix security audit log
and metrics2 property configuration warnings. (omalley)

Added:
    hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties
Removed:
    hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties.example
Modified:
    hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
    hadoop/common/branches/branch-0.20-security-203/conf/log4j.properties
    hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java

Modified: hadoop/common/branches/branch-0.20-security-203/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt?rev=1097966&r1=1097965&r2=1097966&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-203/CHANGES.txt Fri Apr 29 21:57:15 2011
@@ -2,6 +2,9 @@ Hadoop Change Log
 
 Release 0.20.203.0 - unreleased
 
+    HADOOP-7253. Update the default configuration to fix security audit log
+    and metrics2 property configuration warnings. (omalley)
+
     HADOOP-7247. Update documentation to match current jar names. (omalley)
 
     HADOOP-7246. Update the log4j configuration to match the EventCounter

Added: hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties?rev=1097966&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties (added)
+++ hadoop/common/branches/branch-0.20-security-203/conf/hadoop-metrics2.properties Fri Apr
29 21:57:15 2011
@@ -0,0 +1,16 @@
+# syntax: [prefix].[source|sink|jmx].[instance].[options]
+# See package.html for org.apache.hadoop.metrics2 for details
+
+*.sink.file.class=org.apache.hadoop.metrics2.sink.FileSink
+
+#namenode.sink.file.filename=namenode-metrics.out
+
+#datanode.sink.file.filename=datanode-metrics.out
+
+#jobtracker.sink.file.filename=jobtracker-metrics.out
+
+#tasktracker.sink.file.filename=tasktracker-metrics.out
+
+#maptask.sink.file.filename=maptask-metrics.out
+
+#reducetask.sink.file.filename=reducetask-metrics.out

Modified: hadoop/common/branches/branch-0.20-security-203/conf/log4j.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/conf/log4j.properties?rev=1097966&r1=1097965&r2=1097966&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/conf/log4j.properties (original)
+++ hadoop/common/branches/branch-0.20-security-203/conf/log4j.properties Fri Apr 29 21:57:15
2011
@@ -79,7 +79,8 @@ log4j.appender.DRFAS.File=${hadoop.log.d
 log4j.appender.DRFAS.layout=org.apache.log4j.PatternLayout
 log4j.appender.DRFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
 #new logger
-log4j.category.SecurityLogger=INFO,DRFAS
+log4j.logger.SecurityLogger=OFF,console
+log4j.logger.SecurityLogger.additivity=false
 
 #
 # Rolling File Appender
@@ -100,7 +101,7 @@ log4j.category.SecurityLogger=INFO,DRFAS
 # FSNamesystem Audit logging
 # All audit events are logged at INFO level
 #
-log4j.logger.org.apache.hadoop.fs.FSNamesystem.audit=WARN
+log4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=WARN
 
 # Custom Logging levels
 

Modified: hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java?rev=1097966&r1=1097965&r2=1097966&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
(original)
+++ hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/metrics2/impl/TestMetricsConfig.java
Fri Apr 29 21:57:15 2011
@@ -110,21 +110,6 @@ public class TestMetricsConfig {
   }
 
   /**
-   * Should throw if missing config files
-   */
-  @Test public void testMissingFiles() {
-    try {
-      MetricsConfig.create("JobTracker");
-    }
-    catch (MetricsConfigException e) {
-      assertTrue("expected the 'cannot locate configuration' exception",
-                 e.getMessage().startsWith("Cannot locate configuration"));
-      return;
-    }
-    fail("should've thrown");
-  }
-
-  /**
    * Test the config file load order
    * @throws Exception
    */



Mime
View raw message