You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/03/22 19:45:46 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2448] Change TM
SplitHelper to get configured parent znode instead of hard-coded /hbase
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 0d42cb6d8 -> c978ab556
[TRAFODION-2448] Change TM SplitHelper to get configured parent znode instead of hard-coded /hbase
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ee04227f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ee04227f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ee04227f
Branch: refs/heads/master
Commit: ee04227ffe0c3a13231bb55b1399aed56c64a8c9
Parents: 6155ff1
Author: Oliver Bucaojit <ob...@gmail.com>
Authored: Wed Mar 15 21:26:30 2017 -0700
Committer: Oliver Bucaojit <ob...@gmail.com>
Committed: Wed Mar 15 21:26:30 2017 -0700
----------------------------------------------------------------------
.../coprocessor/transactional/SplitBalanceHelper.java | 11 +++++++++--
.../transactional/TrxRegionObserver.java.tmpl | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ee04227f/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
index c1c23ce..e30f01e 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
@@ -33,7 +33,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.transactional.TransactionalRegionScannerHolder;
@@ -49,7 +51,7 @@ public class SplitBalanceHelper {
private Path flushPath;
- private static String zkTable = "/hbase/table";
+ private static String zkTable;
private static String zSplitBalPath = TrxRegionObserver.zTrafPath + "splitbalance/";
private static String zSplitBalPathNoSlash = TrxRegionObserver.zTrafPath + "splitbalance";
private static String SPLIT = "SPLIT";
@@ -65,7 +67,12 @@ public class SplitBalanceHelper {
private HRegion region;
private String tablename;
- public SplitBalanceHelper(HRegion my_Region, ZooKeeperWatcher zkw) {
+ public SplitBalanceHelper(HRegion my_Region, ZooKeeperWatcher zkw, Configuration conf) {
+
+ String parentZNode = conf.get(HConstants.ZOOKEEPER_ZNODE_PARENT,
+ HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
+ SplitBalanceHelper.zkTable = parentZNode + "/table";
+ if(LOG.isDebugEnabled()) LOG.debug("zkTable value: " + SplitBalanceHelper.zkTable);
String fileName = FLUSH_PATH + getTimeStamp();
this.region = my_Region;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ee04227f/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
index 5f62663..6d944c4 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionObserver.java.tmpl
@@ -333,7 +333,7 @@ public void start(CoprocessorEnvironment e) throws IOException {
transactionsRefMap.put(lv_regionName+trxkeyScanners, this.scanners);
}
- sbHelper = new SplitBalanceHelper(my_Region, zkw1);
+ sbHelper = new SplitBalanceHelper(my_Region, zkw1, conf);
if (LOG.isTraceEnabled()) LOG.trace("Trafodion Recovery Region Observer CP: trxRegionObserver load start complete");
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2448] PR 1013
TM SplitHelper change to get conf parent znode
Posted by db...@apache.org.
Merge [TRAFODION-2448] PR 1013 TM SplitHelper change to get conf parent znode
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c978ab55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c978ab55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c978ab55
Branch: refs/heads/master
Commit: c978ab5560eeec0b0fa3c273ecfbe6bd4b342666
Parents: 0d42cb6 ee04227
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Mar 22 19:44:57 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Mar 22 19:44:57 2017 +0000
----------------------------------------------------------------------
.../coprocessor/transactional/SplitBalanceHelper.java | 11 +++++++++--
.../transactional/TrxRegionObserver.java.tmpl | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------