Clone
 

sean broeder <sbroeder@edev06.esgyn.local> in Trafodion

Updated sqenvcom.sh for version 2.4 and updated copyright year for 2018

Merge branch 'master' of github.com:apache/trafodion into sean_traf

Added blank line to test commit permission

Fix for [Trafodion-2348] TransactionState.hasConflict gets a null pointer exception

Fix for JIRA [TRAFODION-2305] After a region split the transactions to check against list is not fully populated

Fix for TLOG looping in deleteEntriesOlderThanASN JIRA [TRAFODION-2253]

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

[TRAFODION-2236] Fix to handle bad TM ZK node entries during recovery This is the second fix for JIRA [TRAFODION-2236] [Author: Sean Broeder <sbroeder@edev06.esgyn.local>]

Squashed commit of the following:

commit 66030b519c49b4abe66b8b49b9ddc63a9543d8fc

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Thu Sep 29 18:55:39 2016 +0000

Addressing review comments

commit c1b22cf41eeb56c3002a2ca86d2b204772667b9d

Merge: 6ee98ca a62e76f

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Thu Sep 29 16:14:16 2016 +0000

Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf

commit 6ee98cab2a8adf07df365131f431f1ded3e15d3a

Merge: 98a1ec6 b352dd8

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Thu Sep 29 15:14:38 2016 +0000

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

commit a62e76faf1753a02dd9095aa1061829b537da49f

Merge: 98a1ec6 b352dd8

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Thu Sep 29 15:14:38 2016 +0000

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

commit 98a1ec6bdf0eb9b69fbb6f4d8c908e657638ba54

Merge: d7232d3 fd4fadf

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Wed Sep 28 23:20:57 2016 +0000

Fix to handle bad TM ZK node entries during recovery

commit b352dd8f1fdab8f73bf2f4dea3b0ac757dd6ad29

Merge: d7232d3 fd4fadf

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Wed Sep 28 23:20:57 2016 +0000

Fix to handle bad TM ZK node entries during recovery

commit d7232d3f816129464a3449cea56a10919794ddd2

Merge: 0ccafa2 1e94882

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Wed Sep 28 23:19:20 2016 +0000

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

commit fd4fadffab1f969dd1e3e735b01a9c62d9bb9766

Author: Sean Broeder <sean.broeder@esgyn.com>

Date: Tue Sep 27 10:22:02 2016 -0700

Update TransactionManager.java

commit 0ccafa240eb1ee225226c18c1396204830bea8ad

Author: Sean Broeder <sbroeder@edev06.esgyn.local>

Date: Tue Sep 27 03:13:23 2016 +0000

Fix to handle bad TM ZK node entries during recovery

This is the second fix for JIRA [TRAFODION-2236]

This closes #730

Addressing review comments

Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf

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

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

Fix to handle bad TM ZK node entries during recovery

Fix to handle bad TM ZK node entries during recovery

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Fix to handle bad TM ZK node entries during recovery This is the second fix for JIRA [TRAFODION-2236]

Recovery changes for region transaction changes Fixes are part of JIRA [TRAFODION-1435]

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf

Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf

Merge remote branch 'sbroeder_inctraf/sean_traf' into sean_traf

Adding expected file for test116 for JIRA [TRAFODION-1435]

    • -18
    • +23
    /core/sql/regress/core/EXPECTED116
Merging HEAD and addressing review comments for JIRA [TRAFODION-1435]

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Conflicts:

core/sql/src/main/java/org/trafodion/sql/HTableClient.java

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf

Second set of changes for JIRA [TRAFODION-1435] Region operations performed transactionally for delete, chackAndDelete Improved endpoint coprocessor exception logging

Fix to prevent transaction and table hang when trying to close a region

Fix for recovery IOException 2016-08-21 22:05:02,531 ERROR dtm.HBaseTxClient: Caught recovery thread exception for tmid: 0 retries: 0 java.io.IOException: Non-migratable/unknown version=1 at org.apache.hadoop.hbase.HRegionInfo.readFields(HRegionInfo.java:895) at org.trafodion.dtm.HBaseTxClient$RecoveryThread.addRegionToTS(HBaseTxClient.java:967) at org.trafodion.dtm.HBaseTxClient$RecoveryThread.run(HBaseTxClient.java:1094)

Adding copyright

Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf