This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 88d8c3d HDFS-16241. Standby close reconstruction thread (#3493)
88d8c3d is described below
commit 88d8c3d0c88bcec5acca30aadca36b7d65c4237c
Author: langlaile1221 <[email protected]>
AuthorDate: Mon Oct 11 16:11:31 2021 +0800
HDFS-16241. Standby close reconstruction thread (#3493)
Co-authored-by: zhanghuazong <Zhz@20068867>
---
.../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 a0a20ee..69e9ca8 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
@@ -3647,7 +3647,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 b01c660..1fb6238 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
@@ -1458,8 +1458,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: [email protected]
For additional commands, e-mail: [email protected]
