Repository: hbase Updated Branches: refs/heads/branch-1 f82147831 -> e44527272
Revert "HBASE-15261 Make Throwable t in DaughterOpener volatile (Huaxiang Sun)" Not needed afterall This reverts commit e42065c308f53123b947c4d36f19a3261c269cd3. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4452727 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4452727 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4452727 Branch: refs/heads/branch-1 Commit: e4452727246c3d9ffeb1c50fc1e62775c8c0fdbd Parents: f821478 Author: stack <[email protected]> Authored: Thu Mar 10 15:41:30 2016 -0800 Committer: stack <[email protected]> Committed: Thu Mar 10 15:41:30 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/e4452727/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 {
