Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 659A2200C5B for ; Thu, 27 Apr 2017 18:53:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 64342160BA7; Thu, 27 Apr 2017 16:53:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AB10E160B9E for ; Thu, 27 Apr 2017 18:53:44 +0200 (CEST) Received: (qmail 98958 invoked by uid 500); 27 Apr 2017 16:53:43 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 98938 invoked by uid 99); 27 Apr 2017 16:53:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Apr 2017 16:53:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B62ADDFBDA; Thu, 27 Apr 2017 16:53:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhz@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-11709. StandbyCheckpointer should handle an non-existing legacyOivImageDir gracefully. Contributed by Erik Krogen. Date: Thu, 27 Apr 2017 16:53:42 +0000 (UTC) archived-at: Thu, 27 Apr 2017 16:53:45 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 b500714e9 -> fc46f398d HDFS-11709. StandbyCheckpointer should handle an non-existing legacyOivImageDir gracefully. Contributed by Erik Krogen. (cherry picked from commit d8a33098309f17dfb0e3a000934f68394de44bf7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc46f398 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc46f398 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc46f398 Branch: refs/heads/branch-2 Commit: fc46f398d9192e83c7197115589eca7805c49943 Parents: b500714 Author: Zhe Zhang Authored: Thu Apr 27 09:50:30 2017 -0700 Committer: Zhe Zhang Committed: Thu Apr 27 09:51:04 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/fc46f398/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 31fa5a2..5c09043 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 @@ -190,7 +190,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: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org