From f1a85b2be37f1843f3f63b49889275c63060a273 Mon Sep 17 00:00:00 2001 From: Mingliang Liu Date: Tue, 11 Apr 2017 18:02:18 -0700 Subject: [PATCH] HDFS-11558. BPServiceActor thread name is too long. Contributed by Xiaobing Zhou --- .../hdfs/server/datanode/BPOfferService.java | 19 ++++++++++++++++--- .../hdfs/server/datanode/BPServiceActor.java | 19 +++++++++++-------- .../server/datanode/BlockPoolManager.java | 8 +++++--- .../server/datanode/TestBPOfferService.java | 2 +- .../server/datanode/TestBlockPoolManager.java | 4 +++- 5 files changed, 36 insertions(+), 16 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 1b0806f9b32..2f64b15d3b4 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 @@ -68,7 +68,8 @@ class BPOfferService { * handshake. */ volatile DatanodeRegistration bpRegistration; - + + private final String nameserviceId; private final DataNode dn; /** @@ -118,12 +119,16 @@ void writeUnlock() { mWriteLock.unlock(); } - BPOfferService(List nnAddrs, - List lifelineNnAddrs, DataNode dn) { + BPOfferService( + final String nameserviceId, + List nnAddrs, + List lifelineNnAddrs, + DataNode dn) { Preconditions.checkArgument(!nnAddrs.isEmpty(), "Must pass at least one NN."); Preconditions.checkArgument(nnAddrs.size() == lifelineNnAddrs.size(), "Must pass same number of NN addresses and lifeline addresses."); + this.nameserviceId = nameserviceId; this.dn = dn; for (int i = 0; i < nnAddrs.size(); ++i) { @@ -168,6 +173,14 @@ boolean isAlive() { return false; } + /** + * Gets nameservice id to which this {@link BPOfferService} maps to. + * @return nameservice id, which can be null. + */ + String getNameserviceId() { + return nameserviceId; + } + String getBlockPoolId() { readLock(); try { 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 235d30f6301..56ad49ba994 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 @@ -25,7 +25,6 @@ import java.net.InetSocketAddress; import java.net.SocketTimeoutException; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -280,6 +279,9 @@ private void connectToNNAndHandshake() throws IOException { // the first NN connection for this BP. bpos.verifyAndSetNamespaceInfo(this, nsInfo); + /* set thread name again to include NamespaceInfo when it's available. */ + this.bpThread.setName(formatThreadName("heartbeating", nnAddr)); + // Second phase of the handshake with the NN. register(nsInfo); } @@ -548,11 +550,12 @@ void start() { } } - private String formatThreadName(String action, InetSocketAddress addr) { - Collection dataDirs = - DataNode.getStorageLocations(dn.getConf()); - return "DataNode: [" + dataDirs.toString() + "] " + - action + " to " + addr; + private String formatThreadName( + final String action, + final InetSocketAddress addr) { + final String prefix = bpos.getBlockPoolId() != null ? bpos.getBlockPoolId() + : bpos.getNameserviceId(); + return prefix + " " + action + " to " + addr; } //This must be called only by blockPoolManager. @@ -1008,8 +1011,8 @@ public void run() { } public void start() { - lifelineThread = new Thread(this, formatThreadName("lifeline", - lifelineNnAddr)); + lifelineThread = new Thread(this, + formatThreadName("lifeline", lifelineNnAddr)); lifelineThread.setDaemon(true); lifelineThread.setUncaughtExceptionHandler( new Thread.UncaughtExceptionHandler() { diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java index e94bbb762f2..f6a11c24bb5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java @@ -211,7 +211,7 @@ private void doRefreshNamenodes( lifelineAddrs.add(nnIdToLifelineAddr != null ? nnIdToLifelineAddr.get(nnId) : null); } - BPOfferService bpos = createBPOS(addrs, lifelineAddrs); + BPOfferService bpos = createBPOS(nsToAdd, addrs, lifelineAddrs); bpByNameserviceId.put(nsToAdd, bpos); offerServices.add(bpos); } @@ -261,8 +261,10 @@ private void doRefreshNamenodes( /** * Extracted out for test purposes. */ - protected BPOfferService createBPOS(List nnAddrs, + protected BPOfferService createBPOS( + final String nameserviceId, + List nnAddrs, List lifelineNnAddrs) { - return new BPOfferService(nnAddrs, lifelineNnAddrs, dn); + return new BPOfferService(nameserviceId, nnAddrs, lifelineNnAddrs, dn); } } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java index b9220e0f6c3..aa47eeb3e3c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java @@ -412,7 +412,7 @@ private BPOfferService setupBPOSForNNs(DataNode mockDn, Mockito.eq(new InetSocketAddress(port))); } - return new BPOfferService(Lists.newArrayList(nnMap.keySet()), + return new BPOfferService("test_ns", Lists.newArrayList(nnMap.keySet()), Collections.nCopies(nnMap.size(), null), mockDn); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockPoolManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockPoolManager.java index 48006dcb06c..951adbdc545 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockPoolManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockPoolManager.java @@ -51,7 +51,9 @@ public void setupBPM() { bpm = new BlockPoolManager(mockDN){ @Override - protected BPOfferService createBPOS(List nnAddrs, + protected BPOfferService createBPOS( + final String nameserviceId, + List nnAddrs, List lifelineNnAddrs) { final int idx = mockIdx++; doLog("create #" + idx);