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 31FAD18999 for ; Thu, 10 Mar 2016 23:46:26 +0000 (UTC) Received: (qmail 60971 invoked by uid 500); 10 Mar 2016 23:46:25 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 60934 invoked by uid 500); 10 Mar 2016 23:46:25 -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 60925 invoked by uid 99); 10 Mar 2016 23:46:25 -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, 10 Mar 2016 23:46:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B32F6DFA6F; Thu, 10 Mar 2016 23:46:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: <37a7187af38246df99b5997db4df1095@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: Revert "HBASE-15261 Make Throwable t in DaughterOpener volatile (Huaxiang Sun)" Not needed afterall This reverts commit 3474a9e23c78e92942bfde2e51aab91ea4ecb84e. Date: Thu, 10 Mar 2016 23:46:25 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.2 6497b365c -> 9cb1c1c51 Revert "HBASE-15261 Make Throwable t in DaughterOpener volatile (Huaxiang Sun)" Not needed afterall This reverts commit 3474a9e23c78e92942bfde2e51aab91ea4ecb84e. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9cb1c1c5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9cb1c1c5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9cb1c1c5 Branch: refs/heads/branch-1.2 Commit: 9cb1c1c510079f98fcbc7ce91ea1f928efbcd8eb Parents: 6497b36 Author: stack Authored: Thu Mar 10 15:46:08 2016 -0800 Committer: stack Committed: Thu Mar 10 15:46:08 2016 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/regionserver/SplitTransactionImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9cb1c1c5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java index 3be9581..958e1f3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransactionImpl.java @@ -642,7 +642,7 @@ public class SplitTransactionImpl implements SplitTransaction { Put putParent = MetaTableAccessor.makePutFromRegionInfo(copyOfParent); MetaTableAccessor.addDaughtersToPut(putParent, splitA, splitB); mutations.add(putParent); - + //Puts for daughters Put putA = MetaTableAccessor.makePutFromRegionInfo(splitA); Put putB = MetaTableAccessor.makePutFromRegionInfo(splitB); @@ -687,7 +687,7 @@ public class SplitTransactionImpl implements SplitTransaction { class DaughterOpener extends HasThread { private final Server server; private final HRegion r; - private volatile Throwable t = null; + private Throwable t = null; DaughterOpener(final Server s, final HRegion r) { super((s == null? "null-services": s.getServerName()) + @@ -890,7 +890,7 @@ public class SplitTransactionImpl implements SplitTransaction { return splitStoreFile(family, sf); } } - + @Override public boolean rollback(final Server server, final RegionServerServices services) throws IOException {