You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/28 23:26:24 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1564]Split/balance
is not being delayed
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 397e06b16 -> c5e3d7878
[TRAFODION-1564]Split/balance is not being delayed
Region split/balance is not being delayed if Trx Scanner obj is present
Fix was to delay on scanners list clear OR pending list clear instead
of AND.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fe335020
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fe335020
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fe335020
Branch: refs/heads/master
Commit: fe335020c79adcff023b46dd942ff601ce2330f6
Parents: 7cf4caa
Author: Oliver Bucaojit <ol...@esgyn.com>
Authored: Tue Oct 27 22:43:49 2015 +0000
Committer: Oliver Bucaojit <ol...@esgyn.com>
Committed: Tue Oct 27 22:43:49 2015 +0000
----------------------------------------------------------------------
.../hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe335020/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 a610f79..f802b29 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
@@ -251,7 +251,7 @@ public class SplitBalanceHelper {
ConcurrentHashMap<Long,TransactionalRegionScannerHolder> scanners,
int pendingDelayLen) throws IOException {
int count = 1;
- while(!scannersListClear(scanners) && !pendingListClear(commitPendingTransactions)) {
+ while(!scannersListClear(scanners) || !pendingListClear(commitPendingTransactions)) {
try {
if(LOG.isDebugEnabled()) LOG.debug("pendingAndScannersWait() delay, count " + count++ + " on: " + hri.getRegionNameAsString());
Thread.sleep(pendingDelayLen);
[2/2] incubator-trafodion git commit: Merge remote branch
'origin/pr/148/head' into mrg_73
Posted by su...@apache.org.
Merge remote branch 'origin/pr/148/head' into mrg_73
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c5e3d787
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c5e3d787
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c5e3d787
Branch: refs/heads/master
Commit: c5e3d78789ed10a91bc25903173e3a6396680f6a
Parents: 397e06b fe33502
Author: Suresh Subbiah <su...@apache.org>
Authored: Wed Oct 28 22:26:06 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Wed Oct 28 22:26:06 2015 +0000
----------------------------------------------------------------------
.../hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------