svn commit: r1160873 - in /hadoop/common/trunk/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java

[to...@apache.org]

Author: todd
Date: Tue Aug 23 19:47:14 2011
New Revision: 1160873

URL: http://svn.apache.org/viewvc?rev=1160873&view=rev
Log:
HDFS-2267. DataXceiver thread name incorrect while waiting on op during keepalive. Contributed by Todd Lipcon.

Modified:
    hadoop/common/trunk/hadoop-hdfs/CHANGES.txt
    hadoop/common/trunk/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java

Modified: hadoop/common/trunk/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs/CHANGES.txt?rev=1160873&r1=1160872&r2=1160873&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs/CHANGES.txt Tue Aug 23 19:47:14 2011
@@ -986,6 +986,9 @@ Trunk (unreleased changes)
     HDFS-1257. Fix a race condition on BlockManager.recentInvalidateSets.
     (Eric Payne via szetszwo)
 
+    HDFS-2267. DataXceiver thread name incorrect while waiting on op during
+    keepalive. (todd)
+
   BREAKDOWN OF HDFS-1073 SUBTASKS
 
     HDFS-1521. Persist transaction ID on disk between NN restarts.

Modified: hadoop/common/trunk/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java?rev=1160873&r1=1160872&r2=1160873&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java (original)
+++ hadoop/common/trunk/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java Tue Aug 23 19:47:14 2011
@@ -127,8 +127,6 @@ class DataXceiver extends Receiver imple
    * Read/write data from/to the DataXceiverServer.
    */
   public void run() {
-    updateCurrentThreadName("Waiting for operation");
-
     int opsProcessed = 0;
     Op op = null;
     try {
@@ -138,6 +136,8 @@ class DataXceiver extends Receiver imple
       // This optimistic behaviour allows the other end to reuse connections.
       // Setting keepalive timeout to 0 disable this behavior.
       do {
+        updateCurrentThreadName("Waiting for operation #" + (opsProcessed + 1));
+
         try {
           if (opsProcessed != 0) {
             assert socketKeepaliveTimeout > 0;