From 867903db2b38a59c86e71f1aaef3b0f9a87bfe17 Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Tue, 6 Jun 2017 13:51:02 -0700
Subject: [PATCH] HDFS-11932. BPServiceActor thread name is not correctly set.
 Contributed by Chen Liang.

---
 .../apache/hadoop/hdfs/server/datanode/BPOfferService.java    | 4 ++--
 .../apache/hadoop/hdfs/server/datanode/BPServiceActor.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
index 042169a9e60..2644c0f765a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
@@ -189,8 +189,8 @@ String getBlockPoolId() {
       if (bpNSInfo != null) {
         return bpNSInfo.getBlockPoolID();
       } else {
-        LOG.warn("Block pool ID needed, but service not yet registered with NN",
-            new Exception("trace"));
+        LOG.warn("Block pool ID needed, but service not yet registered with " +
+                "NN, trace:", new Exception());
         return null;
       }
     } finally {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
index fcf7d5e97af..08968444a82 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
@@ -541,7 +541,7 @@ void start() {
       //Thread is started already
       return;
     }
-    bpThread = new Thread(this, formatThreadName("heartbeating", nnAddr));
+    bpThread = new Thread(this);
     bpThread.setDaemon(true); // needed for JUnit testing
     bpThread.start();