chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r765466 - /hadoop/chukwa/trunk/conf/
Date Thu, 16 Apr 2009 05:29:33 GMT
Author: eyang
Date: Thu Apr 16 05:29:32 2009
New Revision: 765466

URL: http://svn.apache.org/viewvc?rev=765466&view=rev
Log:
CHUKWA-112. Changed configuration files to be more consistent. (Eric Yang)

Added:
    hadoop/chukwa/trunk/conf/alert.template   (props changed)
      - copied unchanged from r764268, hadoop/chukwa/trunk/conf/alert.conf.template
    hadoop/chukwa/trunk/conf/chukwa-demux-conf.xml
      - copied unchanged from r764542, hadoop/chukwa/trunk/conf/chukwa-demux-conf.xml.template
    hadoop/chukwa/trunk/conf/database_create_tables.sql   (contents, props changed)
      - copied, changed from r764268, hadoop/chukwa/trunk/conf/database_create_tables
    hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties   (contents, props changed)
      - copied, changed from r764268, hadoop/chukwa/trunk/conf/chukwa-hadoop-metrics-log4j.properties
    hadoop/chukwa/trunk/conf/hadoop-metrics.properties   (contents, props changed)
      - copied, changed from r764268, hadoop/chukwa/trunk/conf/hadoop-metrics.properties.template
    hadoop/chukwa/trunk/conf/mdl.xml   (contents, props changed)
      - copied, changed from r764268, hadoop/chukwa/trunk/conf/mdl.xml.template
Removed:
    hadoop/chukwa/trunk/conf/alert.conf.template
    hadoop/chukwa/trunk/conf/chukwa-demux-conf.xml.template
    hadoop/chukwa/trunk/conf/chukwa-hadoop-metrics-log4j.properties
    hadoop/chukwa/trunk/conf/database_create_tables
    hadoop/chukwa/trunk/conf/hadoop-metrics.properties.template
    hadoop/chukwa/trunk/conf/mdl.xml.template

Propchange: hadoop/chukwa/trunk/conf/alert.template
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 05:29:32 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/alert.conf.template:713112

Copied: hadoop/chukwa/trunk/conf/database_create_tables.sql (from r764268, hadoop/chukwa/trunk/conf/database_create_tables)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/database_create_tables.sql?p2=hadoop/chukwa/trunk/conf/database_create_tables.sql&p1=hadoop/chukwa/trunk/conf/database_create_tables&r1=764268&r2=765466&rev=765466&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/database_create_tables (original)
+++ hadoop/chukwa/trunk/conf/database_create_tables.sql Thu Apr 16 05:29:32 2009
@@ -439,6 +439,10 @@
     reduce_input_records bigint default 0,
     reduce_output_records bigint default 0,
     jobconf  text, 
+    finished_maps default 0,
+    finished_reduces default 0,
+    failed_maps default 0,
+    failed_reduces default 0,
     primary key(job_id),
     index(submit_time, finish_time, user, queue)
 ) ENGINE=InnoDB;

Propchange: hadoop/chukwa/trunk/conf/database_create_tables.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 05:29:32 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/database_create_tables:713112

Copied: hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties (from r764268, hadoop/chukwa/trunk/conf/chukwa-hadoop-metrics-log4j.properties)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties?p2=hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties&p1=hadoop/chukwa/trunk/conf/chukwa-hadoop-metrics-log4j.properties&r1=764268&r2=765466&rev=765466&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/chukwa-hadoop-metrics-log4j.properties (original)
+++ hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties Thu Apr 16 05:29:32 2009
@@ -0,0 +1,32 @@
+log4j.appender.chukwa.rpc.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.rpc.chukwaClientHostname=localhost
+log4j.appender.chukwa.rpc.chukwaClientPortNum=9093
+log4j.appender.chukwa.rpc.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.rpc.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.rpc.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.rpc.Dir=/grid/0/chukwa/var/log/metrics
+
+log4j.appender.chukwa.jvm.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.jvm.chukwaClientHostname=localhost
+log4j.appender.chukwa.jvm.chukwaClientPortNum=9093
+log4j.appender.chukwa.jvm.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.jvm.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.jvm.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.jvm.Dir=/grid/0/chukwa/var/log/metrics
+
+log4j.appender.chukwa.dfs.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.dfs.chukwaClientHostname=localhost
+log4j.appender.chukwa.dfs.chukwaClientPortNum=9093
+log4j.appender.chukwa.dfs.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.dfs.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.dfs.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.dfs.Dir=/grid/0/chukwa/var/log/metrics
+
+log4j.appender.chukwa.mapred.recordType=HadoopMetricsProcessor
+log4j.appender.chukwa.mapred.chukwaClientHostname=localhost
+log4j.appender.chukwa.mapred.chukwaClientPortNum=9093
+log4j.appender.chukwa.mapred.DatePattern=.yyyy-MM-dd
+log4j.appender.chukwa.mapred.layout=org.apache.log4j.PatternLayout
+log4j.appender.chukwa.mapred.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.chukwa.mapred.Dir=/grid/0/chukwa/var/log/metrics
+

Propchange: hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 05:29:32 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/chukwa-hadoop-metrics-log4j.properties:713112

Copied: hadoop/chukwa/trunk/conf/hadoop-metrics.properties (from r764268, hadoop/chukwa/trunk/conf/hadoop-metrics.properties.template)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/hadoop-metrics.properties?p2=hadoop/chukwa/trunk/conf/hadoop-metrics.properties&p1=hadoop/chukwa/trunk/conf/hadoop-metrics.properties.template&r1=764268&r2=765466&rev=765466&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/hadoop-metrics.properties.template (original)
+++ hadoop/chukwa/trunk/conf/hadoop-metrics.properties Thu Apr 16 05:29:32 2009
@@ -1,31 +1,31 @@
-#chukwaAgent.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chukwaAgent.period=60
-#chukwaAgent.directory=/tmp/
+chukwaAgent.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chukwaAgent.period=60
+chukwaAgent.directory=@CHUKWA_LOG_DIR@/metrics/
  
-#chukwaHttpSender.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chukwaHttpSender.period=60
-#chukwaHttpSender.directory=/tmp/
-
-#chunkQueue.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#chunkQueue.period=60
-#chunkQueue.directory=/tmp/
-
-#dfs.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#dfs.period=60
-#dfs.directory=/tmp/
-
-#jvm.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#jvm.period=60
-#jvm.directory=/tmp/
-#jvm.uuid=true
-
-#mapred.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#mapred.period=60
-#mapred.directory=/tmp/
-#mapred.uuid=true
-
-#rpc.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
-#rpc.period=60
-#rpc.directory=/tmp/
-#rpc.uuid=true
+chukwaHttpSender.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chukwaHttpSender.period=60
+chukwaHttpSender.directory=@CHUKWA_LOG_DIR@/metrics/
+
+chunkQueue.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+chunkQueue.period=60
+chunkQueue.directory=@CHUKWA_LOG_DIR@/metrics/
+
+dfs.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+dfs.period=60
+dfs.directory=@CHUKWA_LOG_DIR@/metrics/
+
+jvm.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+jvm.period=60
+jvm.directory=@CHUKWA_LOG_DIR@/metrics/
+jvm.uuid=true
+
+mapred.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+mapred.period=60
+mapred.directory=@CHUKWA_LOG_DIR@/metrics/
+mapred.uuid=true
+
+rpc.class=org.apache.hadoop.chukwa.inputtools.log4j.Log4JMetricsContext
+rpc.period=60
+rpc.directory=@CHUKWA_LOG_DIR@/metrics/
+rpc.uuid=true
 

Propchange: hadoop/chukwa/trunk/conf/hadoop-metrics.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 05:29:32 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/hadoop-metrics.properties.template:713112

Copied: hadoop/chukwa/trunk/conf/mdl.xml (from r764268, hadoop/chukwa/trunk/conf/mdl.xml.template)
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/mdl.xml?p2=hadoop/chukwa/trunk/conf/mdl.xml&p1=hadoop/chukwa/trunk/conf/mdl.xml.template&r1=764268&r2=765466&rev=765466&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/mdl.xml.template (original)
+++ hadoop/chukwa/trunk/conf/mdl.xml Thu Apr 16 05:29:32 2009
@@ -1400,6 +1400,26 @@
   <value>jobconf</value>
 </property>
   
+<property>
+  <name>metric.jobdata.finished_maps</name>
+  <value>finished_maps</value>
+</property>
+
+<property>
+  <name>metric.jobdata.finished_reduces</name>
+  <value>finished_reduces</value>
+</property>
+
+<property>
+  <name>metric.jobdata.failed_maps</name>
+  <value>failed_maps</value>
+</property>
+
+<property>
+  <name>metric.jobdata.failed_reduces</name>
+  <value>failed_reduces</value>
+</property>
+
 <!-- for hadoop 0.20 -->
 <property>
   <name>metric.jobdata.counter:filesystemcounters:hdfs_bytes_read</name>
@@ -1833,5 +1853,16 @@
   <value>5,30,180,720</value>
 </property>
 
+<property>
+  <name>report.db.name.util</name>
+  <value>util</value>
+  <description></description>
+</property>
+
+<property>
+  <name>consolidator.table.util</name>
+  <value>5,30,180,720</value>
+</property>
+
 </configuration>
 

Propchange: hadoop/chukwa/trunk/conf/mdl.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 16 05:29:32 2009
@@ -0,0 +1 @@
+/hadoop/core/branches/branch-0.19/src/contrib/chukwa/conf/mdl.xml.template:713112



Mime
View raw message