Repository: incubator-trafodion Updated Branches: refs/heads/master 81a455e0c -> 24cbb420c
[TRAFODION-2095] code cleanup for jira 2095 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3ee5355f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3ee5355f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3ee5355f Branch: refs/heads/master Commit: 3ee5355f78282987bb3af5be856e21a7ed7489f5 Parents: 9bbee32 Author: Sean Broeder <[email protected]> Authored: Wed Jul 20 02:52:10 2016 +0000 Committer: Sean Broeder <[email protected]> Committed: Wed Jul 20 02:52:10 2016 +0000 ---------------------------------------------------------------------- .../transactional/TransactionManager.java | 29 ++++++++------------ .../java/org/trafodion/dtm/HBaseTxClient.java | 9 ++---- 2 files changed, 14 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3ee5355f/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java ---------------------------------------------------------------------- diff --git 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 index cc4b2fc..1ddd080 100644 --- 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 @@ -1484,23 +1484,18 @@ public class TransactionManager { + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8")); boolean loopExit = false; - do - { - try { - result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable); - loopExit = true; - } - catch (ServiceException se) { - if (LOG.isTraceEnabled()) LOG.trace("pushRegionEpochX -- ServiceException ", se); - throw new IOException(se); - } - catch (Throwable t) { - if (LOG.isTraceEnabled()) LOG.trace("pushRegionEpochX -- Throwable ", t); - throw new IOException(t); - } - - } while (loopExit == false); - + try { + result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable); + loopExit = true; + } + catch (ServiceException se) { + if (LOG.isTraceEnabled()) LOG.trace("pushRegionEpochX -- ServiceException ", se); + throw new IOException(se); + } + catch (Throwable t) { + if (LOG.isTraceEnabled()) LOG.trace("pushRegionEpochX -- Throwable ", t); + throw new IOException(t); + } if(result.size() == 1){ // size is 1 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3ee5355f/core/sqf/src/seatrans/tm/hbasetmlib2/src/main/java/org/trafodion/dtm/HBaseTxClient.java ---------------------------------------------------------------------- diff --git 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 index f296c7b..b06d6c4 100644 --- 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 @@ -698,13 +698,8 @@ public class HBaseTxClient { trxManager.createTable(ts, htdesc, beginEndKeys); } catch (IOException cte) { - if (LOG.isTraceEnabled()) LOG.trace("HBaseTxClient:callCreateTable exception trxManager.createTable, retval: " + - TransReturnCode.RET_EXCEPTION.toString() +" txid: " + transactionId +" Exception: " + cte); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - cte.printStackTrace(pw); - LOG.error("HBaseTxClient createTable call error: " + sw.toString()); - + LOG.error("HBaseTxClient:callCreateTable exception trxManager.createTable, retval: " + + TransReturnCode.RET_EXCEPTION.toString() +" txid: " + transactionId +" Exception: ", cte); throw new IOException("createTable call error", cte); }
