Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf
Conflicts:
core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6ee98cab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6ee98cab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6ee98cab
Branch: refs/heads/master
Commit: 6ee98cab2a8adf07df365131f431f1ded3e15d3a
Parents: 98a1ec6 b352dd8
Author: Sean Broeder <sbroeder@edev06.esgyn.local>
Authored: Thu Sep 29 15:14:38 2016 +0000
Committer: Sean Broeder <sbroeder@edev06.esgyn.local>
Committed: Thu Sep 29 16:13:41 2016 +0000
----------------------------------------------------------------------
.../hbase/client/transactional/TransactionManager.java | 8 ++++----
.../src/main/java/org/trafodion/dtm/HBaseTxClient.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ee98cab/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
----------------------------------------------------------------------
diff --cc
core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
index 7ce8184,caf103f..86b93a1
---
a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
+++
b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
@@@ -3006,17 -3007,7 +3006,17 @@@ public class TransactionManager
table = new HTable(regionInfo.getTable(), connection, cp_tpe);
Map<byte[], RecoveryRequestResponse> rresult = null;
- rresult = table.coprocessorService(TrxRegionService.class,
startKey, endKey, callable);
+ try {
+ rresult = table.coprocessorService(TrxRegionService.class,
startKey, endKey, callable);
+ }
+ catch (ServiceException se) {
- LOG.error("Service exception thrown when calling
recoveryRequest: ", se);
- throw new IOException("Service exception thrown when calling
recoveryRequest:", se);
++ LOG.error("Service exception thrown when recoveryRequest: ",
se);
++ throw new IOException("Service exception thrown when
recoveryRequest:", se);
+ }
+ catch (Throwable t) {
- LOG.error("Exception thrown when calling recoveryRequest: ",
t);
- throw new IOException("Exception thrown when calling
recoveryRequest: ", t);
++ LOG.error("Exception thrown when recoveryRequest: ", t);
++ throw new IOException("Exception thrown when recoveryRequest:
", t);
+ }
Collection<RecoveryRequestResponse> results = rresult.values();
RecoveryRequestResponse[] resultArray = new
RecoveryRequestResponse[results.size()];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6ee98cab/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
----------------------------------------------------------------------
diff --cc
core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
index a27015c,0389c02..217ed70
---
a/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
+++
b/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java
@@@ -1050,7 -1049,7 +1050,7 @@@ public class HBaseTxClient
// Repost a zookeeper entry for all
current regions in the table
zookeeper.postAllRegionEntries(table);
}
-- } // Exception
++ } // IOException
if (TxRecoverList != null) {
if (LOG.isDebugEnabled()) LOG.trace("TRAF
RCOV THREAD:size of TxRecoverList " + TxRecoverList.size());
