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 xk...@apache.org on 2019/08/06 16:49:18 UTC
[hadoop] branch branch-3.2 updated: HDFS-14513. FSImage which is
saving should be clean while NameNode shutdown. Contributed by He Xiaoqiao.
This is an automated email from the ASF dual-hosted git repository.
xkrogen pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 3e8e157 HDFS-14513. FSImage which is saving should be clean while NameNode shutdown. Contributed by He Xiaoqiao.
3e8e157 is described below
commit 3e8e1570f683c047f6ecfd4bad1eaa8d82cd047c
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Tue Jun 11 11:48:35 2019 -0700
HDFS-14513. FSImage which is saving should be clean while NameNode shutdown. Contributed by He Xiaoqiao.
(cherry picked from 5740eea0818f2ba334b99eed0f085300e6b16905)
---
.../hadoop/hdfs/server/namenode/FSImage.java | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
index f8dff1a..cfba091 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
@@ -37,6 +37,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.hadoop.util.ShutdownHookManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.classification.InterfaceAudience;
@@ -88,6 +89,11 @@ public class FSImage implements Closeable {
public static final Logger LOG =
LoggerFactory.getLogger(FSImage.class.getName());
+ /**
+ * Priority of the FSImageSaver shutdown hook: {@value}.
+ */
+ public static final int SHUTDOWN_HOOK_PRIORITY = 10;
+
protected FSEditLog editLog = null;
private boolean isUpgradeFinalized = false;
@@ -1037,6 +1043,18 @@ public class FSImage implements Closeable {
@Override
public void run() {
+ // Deletes checkpoint file in every storage directory when shutdown.
+ Runnable cancelCheckpointFinalizer = () -> {
+ try {
+ deleteCancelledCheckpoint(context.getTxId());
+ LOG.info("FSImageSaver clean checkpoint: txid={} when meet " +
+ "shutdown.", context.getTxId());
+ } catch (IOException e) {
+ LOG.error("FSImageSaver cancel checkpoint threw an exception:", e);
+ }
+ };
+ ShutdownHookManager.get().addShutdownHook(cancelCheckpointFinalizer,
+ SHUTDOWN_HOOK_PRIORITY);
try {
saveFSImage(context, sd, nnf);
} catch (SaveNamespaceCancelledException snce) {
@@ -1046,6 +1064,13 @@ public class FSImage implements Closeable {
} catch (Throwable t) {
LOG.error("Unable to save image for " + sd.getRoot(), t);
context.reportErrorOnStorageDirectory(sd);
+ try {
+ deleteCancelledCheckpoint(context.getTxId());
+ LOG.info("FSImageSaver clean checkpoint: txid={} when meet " +
+ "Throwable.", context.getTxId());
+ } catch (IOException e) {
+ LOG.error("FSImageSaver cancel checkpoint threw an exception:", e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org