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 we...@apache.org on 2021/10/11 08:23:20 UTC
[hadoop] branch branch-3.3 updated: HDFS-16241. Standby close
reconstruction thread (#3493)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new a35a6ec HDFS-16241. Standby close reconstruction thread (#3493)
a35a6ec is described below
commit a35a6ec06bc9a95e1718938da9175a9a3511f4d1
Author: langlaile1221 <35...@users.noreply.github.com>
AuthorDate: Mon Oct 11 16:11:31 2021 +0800
HDFS-16241. Standby close reconstruction thread (#3493)
Co-authored-by: zhanghuazong <Zh...@20068867>
(cherry picked from commit 88d8c3d0c88bcec5acca30aadca36b7d65c4237c)
---
.../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 2 +-
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 8b17cca..ed5f4da 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -3608,7 +3608,7 @@ public class BlockManager implements BlockStatsMXBean {
/*
* Stop the ongoing initialisation of reconstruction queues
*/
- private void stopReconstructionInitializer() {
+ public void stopReconstructionInitializer() {
if (reconstructionQueuesInitializer != null) {
reconstructionQueuesInitializer.interrupt();
try {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 54ce1f6..fbe32c0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -1427,8 +1427,11 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
LOG.info("Stopping services started for active state");
writeLock();
try {
- if (blockManager != null && blockManager.getSPSManager() != null) {
- blockManager.getSPSManager().stop();
+ if (blockManager != null) {
+ blockManager.stopReconstructionInitializer();
+ if (blockManager.getSPSManager() != null) {
+ blockManager.getSPSManager().stop();
+ }
}
stopSecretManager();
leaseManager.stopMonitor();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org