HDFS-11709. StandbyCheckpointer should handle an non-existing legacyOivImageDir gracefully. Contributed by Erik Krogen.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bd16e1fa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bd16e1fa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bd16e1fa Branch: refs/heads/HDFS-10467 Commit: bd16e1fad09fae1c772fb857423c4e385c369070 Parents: c45a71b Author: Zhe Zhang <[email protected]> Authored: Thu Apr 27 09:50:30 2017 -0700 Committer: Inigo <[email protected]> Committed: Tue May 2 14:52:03 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd16e1fa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java index 569c6bf..2196caa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/StandbyCheckpointer.java @@ -197,7 +197,12 @@ public class StandbyCheckpointer { // Save the legacy OIV image, if the output dir is defined. String outputDir = checkpointConf.getLegacyOivImageDir(); if (outputDir != null && !outputDir.isEmpty()) { - img.saveLegacyOIVImage(namesystem, outputDir, canceler); + try { + img.saveLegacyOIVImage(namesystem, outputDir, canceler); + } catch (IOException ioe) { + LOG.error("Exception encountered while saving legacy OIV image; " + + "continuing with other checkpointing steps", ioe); + } } } finally { namesystem.cpUnlock(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
