diff --git a/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs/CHANGES.txt
index ca584732ce..ad1429fa53 100644
--- a/hadoop-hdfs/CHANGES.txt
+++ b/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.
diff --git a/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
index 384d2b93aa..374d309504 100644
--- a/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
+++ b/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
@@ -127,8 +127,6 @@ private void updateCurrentThreadName(String status) {
    * 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 @@ public void run() {
       // 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;