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 he...@apache.org on 2023/02/08 02:58:48 UTC
[hadoop] branch revert-5330-trunk-processCMD created (now 101050fba4b)
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a change to branch revert-5330-trunk-processCMD
in repository https://gitbox.apache.org/repos/asf/hadoop.git
at 101050fba4b Revert "HDFS-16898. Make write lock fine-grain in method processCommandFromActor (#5330). Contributed by ZhangHB."
This branch includes the following new commits:
new 101050fba4b Revert "HDFS-16898. Make write lock fine-grain in method processCommandFromActor (#5330). Contributed by ZhangHB."
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/01: Revert "HDFS-16898. Make write lock fine-grain in method processCommandFromActor (#5330). Contributed by ZhangHB."
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch revert-5330-trunk-processCMD
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 101050fba4b8a2efeef786dc82e6e41513235ba2
Author: Hexiaoqiao <he...@apache.org>
AuthorDate: Wed Feb 8 10:58:36 2023 +0800
Revert "HDFS-16898. Make write lock fine-grain in method processCommandFromActor (#5330). Contributed by ZhangHB."
This reverts commit eb04ecd29d4a38b1b00612cbb3a56ed3a34a9572.
---
.../hdfs/server/datanode/BPOfferService.java | 31 +++++++++-------------
.../hdfs/server/datanode/BPServiceActor.java | 2 +-
2 files changed, 14 insertions(+), 19 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 fdd66cb05d3..d660970c725 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
@@ -679,20 +679,15 @@ class BPOfferService {
actor.reRegister();
return false;
}
- boolean isActiveActor;
- InetSocketAddress nnSocketAddress;
- readLock();
+ writeLock();
try {
- isActiveActor = (actor == bpServiceToActive);
- nnSocketAddress = actor.getNNSocketAddress();
+ if (actor == bpServiceToActive) {
+ return processCommandFromActive(cmd, actor);
+ } else {
+ return processCommandFromStandby(cmd, actor);
+ }
} finally {
- readUnlock();
- }
-
- if (isActiveActor) {
- return processCommandFromActive(cmd, nnSocketAddress);
- } else {
- return processCommandFromStandby(cmd, nnSocketAddress);
+ writeUnlock();
}
}
@@ -720,7 +715,7 @@ class BPOfferService {
* @throws IOException
*/
private boolean processCommandFromActive(DatanodeCommand cmd,
- InetSocketAddress nnSocketAddress) throws IOException {
+ BPServiceActor actor) throws IOException {
final BlockCommand bcmd =
cmd instanceof BlockCommand? (BlockCommand)cmd: null;
final BlockIdCommand blockIdCmd =
@@ -773,7 +768,7 @@ class BPOfferService {
dn.finalizeUpgradeForPool(bp);
break;
case DatanodeProtocol.DNA_RECOVERBLOCK:
- String who = "NameNode at " + nnSocketAddress;
+ String who = "NameNode at " + actor.getNNSocketAddress();
dn.getBlockRecoveryWorker().recoverBlocks(who,
((BlockRecoveryCommand)cmd).getRecoveringBlocks());
break;
@@ -815,11 +810,11 @@ class BPOfferService {
* DNA_REGISTER which should be handled earlier itself.
*/
private boolean processCommandFromStandby(DatanodeCommand cmd,
- InetSocketAddress nnSocketAddress) throws IOException {
+ BPServiceActor actor) throws IOException {
switch(cmd.getAction()) {
case DatanodeProtocol.DNA_ACCESSKEYUPDATE:
LOG.info("DatanodeCommand action from standby NN {}: DNA_ACCESSKEYUPDATE",
- nnSocketAddress);
+ actor.getNNSocketAddress());
if (dn.isBlockTokenEnabled) {
dn.blockPoolTokenSecretManager.addKeys(
getBlockPoolId(),
@@ -836,11 +831,11 @@ class BPOfferService {
case DatanodeProtocol.DNA_UNCACHE:
case DatanodeProtocol.DNA_ERASURE_CODING_RECONSTRUCTION:
LOG.warn("Got a command from standby NN {} - ignoring command: {}",
- nnSocketAddress, cmd.getAction());
+ actor.getNNSocketAddress(), cmd.getAction());
break;
default:
LOG.warn("Unknown DatanodeCommand action: {} from standby NN {}",
- cmd.getAction(), nnSocketAddress);
+ cmd.getAction(), actor.getNNSocketAddress());
}
return true;
}
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 e9f424604b4..35ab6193142 100755
--- 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
@@ -1499,7 +1499,7 @@ class BPServiceActor implements Runnable {
dn.getMetrics().addNumProcessedCommands(processCommandsMs);
}
if (processCommandsMs > dnConf.getProcessCommandsThresholdMs()) {
- LOG.warn("Took {} ms to process {} commands from NN",
+ LOG.info("Took {} ms to process {} commands from NN",
processCommandsMs, cmds.length);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org