You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by as...@apache.org on 2009/11/08 14:50:42 UTC
svn commit: r833876 - in /hadoop/chukwa/trunk: CHANGES.txt
src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
Author: asrabkin
Date: Sun Nov 8 13:50:41 2009
New Revision: 833876
URL: http://svn.apache.org/viewvc?rev=833876&view=rev
Log:
Hosts for DataNode ClientTrace messages parsed incorrectly. Contributed by Jiaqi Tan.
Modified:
hadoop/chukwa/trunk/CHANGES.txt
hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=833876&r1=833875&r2=833876&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Sun Nov 8 13:50:41 2009
@@ -16,6 +16,8 @@
BUG FIXES
+ CHUKWA-411. Hosts for DataNode ClientTrace messages parsed incorrectly. (Jiaqi Tan via asrabkin)
+
CHUKWA-229. Fix file descriptor leak in ExecAdaptor. (asrabkin)
Release 0.3
Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java?rev=833876&r1=833875&r2=833876&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/analysis/salsa/fsm/DataNodeClientTraceMapper.java Sun Nov 8 13:50:41 2009
@@ -60,7 +60,7 @@
protected static final String SEP = "/";
protected static String FSM_CRK_ReduceType = FSMType.NAMES[FSMType.FILESYSTEM_FSM];
private final Pattern ipPattern =
- Pattern.compile(".*[a-zA-Z\\-_:\\/]([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)[a-zA-Z\\-_:\\/].*");
+ Pattern.compile(".*[a-zA-Z\\-_:\\/]([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)[a-zA-Z0-9\\-_:\\/].*");
private final Pattern logMsgPattern = Pattern.compile("^(.{23}) ([A-Z]+) ([a-zA-Z0-9\\.]+): (.*)");
public void map
@@ -140,8 +140,8 @@
datanodeserver_add = new String("");
}
- start_rec.host_exec = new String(datanodeserver_add);
- end_rec.host_exec = new String(datanodeserver_add);
+ start_rec.host_exec = new String(src_add);
+ end_rec.host_exec = new String(src_add);
blkid = val.getValue("blockid").trim();
if (fieldNamesList.contains("cliID")) {