Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0FC4D11625 for ; Sat, 2 Aug 2014 00:18:25 +0000 (UTC) Received: (qmail 92151 invoked by uid 500); 2 Aug 2014 00:18:24 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 91959 invoked by uid 500); 2 Aug 2014 00:18:24 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 91868 invoked by uid 99); 2 Aug 2014 00:18:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Aug 2014 00:18:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A2139BEE5B; Sat, 2 Aug 2014 00:18:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Sat, 02 Aug 2014 00:18:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: HBASE-11650 Write hbase.id to a temporary location and move into place HBASE-11650 Write hbase.id to a temporary location and move into place Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/43ab9979 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/43ab9979 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/43ab9979 Branch: refs/heads/0.98 Commit: 43ab9979a5f496b2a1d9132d14bbadff7dd950a0 Parents: dfef20e Author: Andrew Purtell Authored: Fri Aug 1 17:18:02 2014 -0700 Committer: Andrew Purtell Committed: Fri Aug 1 17:18:02 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/util/FSUtils.java | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/43ab9979/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java index b870b37..c418ec3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java @@ -799,15 +799,28 @@ public abstract class FSUtils { int wait) throws IOException { while (true) { try { - Path filePath = new Path(rootdir, HConstants.CLUSTER_ID_FILE_NAME); - FSDataOutputStream s = fs.create(filePath); + Path idFile = new Path(rootdir, HConstants.CLUSTER_ID_FILE_NAME); + Path tempIdFile = new Path(rootdir, HConstants.HBASE_TEMP_DIRECTORY + + Path.SEPARATOR + HConstants.CLUSTER_ID_FILE_NAME); + // Write the id file to a temporary location + FSDataOutputStream s = fs.create(tempIdFile); try { s.write(clusterId.toByteArray()); - } finally { s.close(); + s = null; + // Move the temporary file to its normal location. Throw an IOE if + // the rename failed + if (!fs.rename(tempIdFile, idFile)) { + throw new IOException("Unable to move temp version file to " + idFile); + } + } finally { + // Attempt to close the stream if still open on the way out + try { + if (s != null) s.close(); + } catch (IOException ignore) { } } if (LOG.isDebugEnabled()) { - LOG.debug("Created cluster ID file at " + filePath.toString() + " with ID: " + clusterId); + LOG.debug("Created cluster ID file at " + idFile.toString() + " with ID: " + clusterId); } return; } catch (IOException ioe) {