You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/03/11 00:46:25 UTC
hbase git commit: Revert "HBASE-15261 Make Throwable t in
DaughterOpener volatile (Huaxiang Sun)" Not needed afterall This reverts
commit 3474a9e23c78e92942bfde2e51aab91ea4ecb84e.
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 <st...@apache.org>
Authored: Thu Mar 10 15:46:08 2016 -0800
Committer: stack <st...@apache.org>
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 {