You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2009/02/23 02:59:10 UTC
svn commit: r746855 - in /hadoop/core/trunk: ./
src/hdfs/org/apache/hadoop/hdfs/server/datanode/
Author: cdouglas
Date: Mon Feb 23 01:59:10 2009
New Revision: 746855
URL: http://svn.apache.org/viewvc?rev=746855&view=rev
Log:
HADOOP-5222. Add offset to datanode clienttrace. Contributed by Lei Xu
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=746855&r1=746854&r2=746855&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Mon Feb 23 01:59:10 2009
@@ -118,6 +118,8 @@
HADOOP-5120. Remove the use of FSNamesystem.getFSNamesystem() from
UpgradeManagerNamenode and UpgradeObjectNamenode. (szetszwo)
+ HADOOP-5222. Add offset to datanode clienttrace. (Lei Xu via cdouglas)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java?rev=746855&r1=746854&r2=746855&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java Mon Feb 23 01:59:10 2009
@@ -801,9 +801,10 @@
DataNode.EMPTY_DEL_HINT);
if (ClientTraceLog.isInfoEnabled() &&
receiver.clientName.length() > 0) {
+ long offset = 0;
ClientTraceLog.info(String.format(DN_CLIENTTRACE_FORMAT,
receiver.inAddr, receiver.myAddr, block.getNumBytes(),
- "HDFS_WRITE", receiver.clientName,
+ "HDFS_WRITE", receiver.clientName, offset,
datanode.dnRegistration.getStorageID(), block));
} else {
LOG.info("Received block " + block +
@@ -924,9 +925,10 @@
DataNode.EMPTY_DEL_HINT);
if (ClientTraceLog.isInfoEnabled() &&
receiver.clientName.length() > 0) {
+ long offset = 0;
ClientTraceLog.info(String.format(DN_CLIENTTRACE_FORMAT,
receiver.inAddr, receiver.myAddr, block.getNumBytes(),
- "HDFS_WRITE", receiver.clientName,
+ "HDFS_WRITE", receiver.clientName, offset,
datanode.dnRegistration.getStorageID(), block));
} else {
LOG.info("Received block " + block +
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java?rev=746855&r1=746854&r2=746855&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/BlockSender.java Mon Feb 23 01:59:10 2009
@@ -412,7 +412,7 @@
}
} finally {
if (clientTraceFmt != null) {
- ClientTraceLog.info(String.format(clientTraceFmt, totalRead));
+ ClientTraceLog.info(String.format(clientTraceFmt, totalRead, initialOffset));
}
close();
}
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=746855&r1=746854&r2=746855&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Mon Feb 23 01:59:10 2009
@@ -138,6 +138,7 @@
", bytes: %s" + // byte count
", op: %s" + // operation
", cliID: %s" + // DFSClient id
+ ", offset: %s" + // offset
", srvID: %s" + // DatanodeRegistration
", blockid: %s"; // block id
static final Log ClientTraceLog =
Modified: hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java?rev=746855&r1=746854&r2=746855&view=diff
==============================================================================
--- hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java (original)
+++ hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java Mon Feb 23 01:59:10 2009
@@ -163,7 +163,7 @@
final String clientTraceFmt =
clientName.length() > 0 && ClientTraceLog.isInfoEnabled()
? String.format(DN_CLIENTTRACE_FORMAT, localAddress, remoteAddress,
- "%d", "HDFS_READ", clientName,
+ "%d", "HDFS_READ", clientName, "%d",
datanode.dnRegistration.getStorageID(), block)
: datanode.dnRegistration + " Served block " + block + " to " +
s.getInetAddress();