chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r766877 - in /hadoop/chukwa/trunk: bin/README bin/chukwa-daemon.sh bin/slaves.sh bin/start-agents.sh bin/stop-agents.sh conf/agents.template conf/database_create_tables.sql conf/hadoop-metrics-log4j.properties
Date Mon, 20 Apr 2009 21:10:52 GMT
Author: eyang
Date: Mon Apr 20 21:10:51 2009
New Revision: 766877

URL: http://svn.apache.org/viewvc?rev=766877&view=rev
Log:
CHUKWA-112. Update chukwa agent config file name. (Eric Yang)


Added:
    hadoop/chukwa/trunk/conf/agents.template
Modified:
    hadoop/chukwa/trunk/bin/README
    hadoop/chukwa/trunk/bin/chukwa-daemon.sh
    hadoop/chukwa/trunk/bin/slaves.sh
    hadoop/chukwa/trunk/bin/start-agents.sh
    hadoop/chukwa/trunk/bin/stop-agents.sh
    hadoop/chukwa/trunk/conf/database_create_tables.sql
    hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties

Modified: hadoop/chukwa/trunk/bin/README
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/README?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/README (original)
+++ hadoop/chukwa/trunk/bin/README Mon Apr 20 21:10:51 2009
@@ -7,8 +7,8 @@
 
 jettyCollector.sh - start the chukwa collector daemon on the current host
 
-start-agents.sh - start chukwa agent daemon (agent.sh) on all hosts listed in conf/chukwa-agents
-stop-agents.sh - stop chukwa agent daemon (agent.sh) on all hosts listed in conf/chukwa-agents
+start-agents.sh - start chukwa agent daemon (agent.sh) on all hosts listed in conf/agents
+stop-agents.sh - stop chukwa agent daemon (agent.sh) on all hosts listed in conf/agents
 
 agent.sh - start the chukwa agent on the current host
 

Modified: hadoop/chukwa/trunk/bin/chukwa-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/chukwa-daemon.sh?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/chukwa-daemon.sh (original)
+++ hadoop/chukwa/trunk/bin/chukwa-daemon.sh Mon Apr 20 21:10:51 2009
@@ -96,7 +96,7 @@
 case $startStop in
 
   (start)
-    MAIL=`cat ${CHUKWA_CONF_DIR}/alert.conf`
+    MAIL=`cat ${CHUKWA_CONF_DIR}/alert`
 
     RANDOM=`date '+%s'`
     PARTROL_HOUR=$[($RANDOM % 24)]

Modified: hadoop/chukwa/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/slaves.sh?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/slaves.sh (original)
+++ hadoop/chukwa/trunk/bin/slaves.sh Mon Apr 20 21:10:51 2009
@@ -21,7 +21,7 @@
 # Environment Variables
 #
 #   CHUKWA_SLAVES    File naming remote hosts.
-#     Default is ${CHUKWA_CONF_DIR}/chukwa-agents.
+#     Default is ${CHUKWA_CONF_DIR}/agents.
 #   CHUKWA_CONF_DIR  Alternate conf dir. Default is ${CHUKWA_HOME}/conf.
 #   CHUKWA_SLAVE_SLEEP Seconds to sleep between spawning remote commands.
 #   CHUKWA_SSH_OPTS Options passed to ssh when running remote commands.
@@ -51,7 +51,7 @@
 
 if [ "$HOSTLIST" = "" ]; then
   if [ "$CHUKWA_SLAVES" = "" ]; then
-    export HOSTLIST="${CHUKWA_CONF_DIR}/chukwa-agents"
+    export HOSTLIST="${CHUKWA_CONF_DIR}/agents"
   else
     export HOSTLIST="${CHUKWA_SLAVES}"
   fi

Modified: hadoop/chukwa/trunk/bin/start-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/start-agents.sh?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/start-agents.sh (original)
+++ hadoop/chukwa/trunk/bin/start-agents.sh Mon Apr 20 21:10:51 2009
@@ -28,4 +28,4 @@
 . "$bin"/chukwa-config.sh
 
 # start chukwa agents
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts chukwa-agents start agent.sh
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents start agent.sh

Modified: hadoop/chukwa/trunk/bin/stop-agents.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/stop-agents.sh?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/stop-agents.sh (original)
+++ hadoop/chukwa/trunk/bin/stop-agents.sh Mon Apr 20 21:10:51 2009
@@ -23,4 +23,4 @@
 
 . "$bin"/chukwa-config.sh
 
-"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts chukwa-agents stop agent.sh
+"$bin"/chukwa-daemons.sh --config $CHUKWA_CONF_DIR --hosts agents stop agent.sh

Added: hadoop/chukwa/trunk/conf/agents.template
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/agents.template?rev=766877&view=auto
==============================================================================
--- hadoop/chukwa/trunk/conf/agents.template (added)
+++ hadoop/chukwa/trunk/conf/agents.template Mon Apr 20 21:10:51 2009
@@ -0,0 +1 @@
+localhost

Modified: hadoop/chukwa/trunk/conf/database_create_tables.sql
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/database_create_tables.sql?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/database_create_tables.sql (original)
+++ hadoop/chukwa/trunk/conf/database_create_tables.sql Mon Apr 20 21:10:51 2009
@@ -439,10 +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,
+    finished_maps bigint default 0,
+    finished_reduces bigint default 0,
+    failed_maps bigint default 0,
+    failed_reduces bigint default 0,
     primary key(job_id),
     index(submit_time, finish_time, user, queue)
 ) ENGINE=InnoDB;

Modified: hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties?rev=766877&r1=766876&r2=766877&view=diff
==============================================================================
--- hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties (original)
+++ hadoop/chukwa/trunk/conf/hadoop-metrics-log4j.properties Mon Apr 20 21:10:51 2009
@@ -4,6 +4,38 @@
 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=@CHUKWA_LOG_DIR@/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=@CHUKWA_LOG_DIR@/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=@CHUKWA_LOG_DIR@/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=@CHUKWA_LOG_DIR@/metrics
+
+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



Mime
View raw message