You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2017/06/13 01:46:28 UTC
hadoop git commit: HDFS-11947. When constructing a thread name,
BPOfferService may print a bogus warning message. Contributed by
Weiwei Yang
Repository: hadoop
Updated Branches:
refs/heads/trunk b3d3ede91 -> bec79ca24
HDFS-11947. When constructing a thread name, BPOfferService may print a bogus warning message. Contributed by Weiwei Yang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bec79ca2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bec79ca2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bec79ca2
Branch: refs/heads/trunk
Commit: bec79ca2495abdc347d64628151c90f5ce777046
Parents: b3d3ede
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Tue Jun 13 09:45:10 2017 +0800
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Tue Jun 13 09:45:10 2017 +0800
----------------------------------------------------------------------
.../hadoop/hdfs/server/datanode/BPOfferService.java | 12 +++++++++---
.../hadoop/hdfs/server/datanode/BPServiceActor.java | 4 ++--
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bec79ca2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java
----------------------------------------------------------------------
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 2644c0f..0384f26 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
@@ -183,14 +183,16 @@ class BPOfferService {
return nameserviceId;
}
- String getBlockPoolId() {
+ String getBlockPoolId(boolean quiet) {
readLock();
try {
if (bpNSInfo != null) {
return bpNSInfo.getBlockPoolID();
} else {
- LOG.warn("Block pool ID needed, but service not yet registered with " +
- "NN, trace:", new Exception());
+ if (!quiet) {
+ LOG.warn("Block pool ID needed, but service not yet registered with "
+ + "NN, trace:", new Exception());
+ }
return null;
}
} finally {
@@ -198,6 +200,10 @@ class BPOfferService {
}
}
+ String getBlockPoolId() {
+ return getBlockPoolId(false);
+ }
+
boolean hasBlockPoolId() {
return getNamespaceInfo() != null;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bec79ca2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java
----------------------------------------------------------------------
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 0896844..a94d2df 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
@@ -553,8 +553,8 @@ class BPServiceActor implements Runnable {
private String formatThreadName(
final String action,
final InetSocketAddress addr) {
- final String prefix = bpos.getBlockPoolId() != null ? bpos.getBlockPoolId()
- : bpos.getNameserviceId();
+ String bpId = bpos.getBlockPoolId(true);
+ final String prefix = bpId != null ? bpId : bpos.getNameserviceId();
return prefix + " " + action + " to " + addr;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org