Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions pkg/dt/distributed_transaction_manger.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,26 @@ func (manager *DistributedTransactionManager) processBranchSessions() error {
return err
}
for _, bs := range branchSessions {
if bs.Status == api.PhaseTwoRollbacking && manager.IsRollingBackDead(bs) {
if manager.rollbackRetryTimeoutUnlockEnable {
if _, err := manager.storageDriver.ReleaseLockKeys(context.Background(), bs.ResourceID, []string{bs.LockKey}); err != nil {
return err
switch bs.Status {
case api.Registered:
case api.PhaseOneFailed:
if err := manager.storageDriver.DeleteBranchSession(context.Background(), bs.BranchID); err != nil {
return err
}
case api.PhaseTwoCommitting:
manager.branchSessionQueue.Add(bs)
case api.PhaseTwoRollbacking:
if manager.IsRollingBackDead(bs) {
log.Debugf("branch session rollback dead, key: %s, lock key: %s", bs.BranchID, bs.LockKey)
if manager.rollbackRetryTimeoutUnlockEnable {
log.Debugf("lock key: %s released", bs.BranchID, bs.LockKey)
if _, err := manager.storageDriver.ReleaseLockKeys(context.Background(), bs.ResourceID, []string{bs.LockKey}); err != nil {
return err
}
}
} else {
manager.branchSessionQueue.Add(bs)
}
log.Debugf("branch session rollback dead, branch id: %s, lock key: %s", bs.BranchID, bs.LockKey)
}
}
return nil
Expand Down