bugfix: fix return of Commit and Rollback (#595)

bugfix: commit or rollback success,but ctx error happens
apache · Feb 3, 2024 · 3534336 · 3534336
1 parent fd9afa8
commit 3534336
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/tm/global_transaction.go b/pkg/tm/global_transaction.go
@@ -98,7 +98,7 @@ func (g *GlobalTransactionManager) Commit(ctx context.Context, gtr *GlobalTransa
 		bf.Wait()
 	}
 
-	if bf.Err() != nil {
+	if err != nil || bf.Err() != nil {
 		lastErr := errors.Wrap(err, bf.Err().Error())
 		log.Warnf("send global commit request failed, xid %s, error %v", gtr.Xid, lastErr)
 		return lastErr
@@ -140,7 +140,7 @@ func (g *GlobalTransactionManager) Rollback(ctx context.Context, gtr *GlobalTran
 		bf.Wait()
 	}
 
-	if bf.Err() != nil {
+	if err != nil && bf.Err() != nil {
 		lastErr := errors.Wrap(err, bf.Err().Error())
 		log.Errorf("GlobalRollbackRequest rollback failed, xid %s, error %v", gtr.Xid, lastErr)
 		return lastErr