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 ta...@apache.org on 2021/03/22 11:31:58 UTC
[hadoop] branch branch-3.3 updated: HDFS-15906. Close FSImage and
FSNamesystem after formatting is complete (#2788)
This is an automated email from the ASF dual-hosted git repository.
tasanuma 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 bc2bdee HDFS-15906. Close FSImage and FSNamesystem after formatting is complete (#2788)
bc2bdee is described below
commit bc2bdee76c1dc2a3d8bee7306f128ff6bdd10a9c
Author: litao <to...@gmail.com>
AuthorDate: Mon Mar 22 19:29:17 2021 +0800
HDFS-15906. Close FSImage and FSNamesystem after formatting is complete (#2788)
(cherry picked from commit 343ce8a8c955dcf64ad453e441947e8761247a5b)
---
.../java/org/apache/hadoop/hdfs/server/namenode/NameNode.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
index 48eb0c1..1e70a45 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
@@ -1249,8 +1249,9 @@ public class NameNode extends ReconfigurableBase implements
LOG.info("Formatting using clusterid: {}", clusterId);
FSImage fsImage = new FSImage(conf, nameDirsToFormat, editDirsToFormat);
+ FSNamesystem fsn = null;
try {
- FSNamesystem fsn = new FSNamesystem(conf, fsImage);
+ fsn = new FSNamesystem(conf, fsImage);
fsImage.getEditLog().initJournalsForWrite();
// Abort NameNode format if reformat is disabled and if
@@ -1275,8 +1276,14 @@ public class NameNode extends ReconfigurableBase implements
fsImage.format(fsn, clusterId, force);
} catch (IOException ioe) {
LOG.warn("Encountered exception during format", ioe);
- fsImage.close();
throw ioe;
+ } finally {
+ if (fsImage != null) {
+ fsImage.close();
+ }
+ if (fsn != null) {
+ fsn.close();
+ }
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org