HDFS-2267. DataXceiver thread name incorrect while waiting on op during keepalive. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1160873 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs/CHANGES.txt

@@ -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.

hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java

@@ -127,8 +127,6 @@ class DataXceiver extends Receiver implements Runnable {
    * 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 implements Runnable {
       // 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;