Fix xa bug12

pkg/datasource/sql/db.go

@@ -22,14 +22,14 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
+	"github.com/seata/seata-go/pkg/util/log"
 	"sync"
 
 	"github.com/seata/seata-go/pkg/datasource/sql/datasource"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
 	"github.com/seata/seata-go/pkg/datasource/sql/undo"
 	"github.com/seata/seata-go/pkg/datasource/sql/util"
 	"github.com/seata/seata-go/pkg/protocol/branch"
-	"github.com/seata/seata-go/pkg/util/log"
 )
 
 type dbOption func(db *DBResource)
@@ -219,7 +219,9 @@ func (db *DBResource) ConnectionForXA(ctx context.Context, xaXid XAXid) (*XAConn
 		return nil, fmt.Errorf("get xa new connection failure, xid:%s, err:%v", xaXid.String(), err)
 	}
 	xaConn := &XAConn{
-		Conn: newDriverConn.(*Conn),
+		Conn: &Conn{
+			targetConn: newDriverConn,
+		},
 	}
 	return xaConn, nil
 }

pkg/datasource/sql/xa_resource_manager.go

@@ -167,9 +167,8 @@ func (xaManager *XAResourceManager) BranchCommit(ctx context.Context, branchReso
 		return branch.BranchStatusPhasetwoRollbackFailedUnretryable, err
 	}
 
-	if commitErr := connectionProxyXA.XaCommit(ctx, xaID); commitErr != nil {
-		err := fmt.Errorf("rollback xa, resourceId: %s", branchResource.ResourceId)
-		log.Errorf(err.Error())
+	if err := connectionProxyXA.XaCommit(ctx, xaID); err != nil {
+		log.Errorf("commit xa, resourceId: %s, err %v", branchResource.ResourceId, err)
 		setBranchStatus(xaID.String(), branch.BranchStatusPhasetwoCommitted)
 		return branch.BranchStatusPhasetwoCommitFailedUnretryable, err
 	}
@@ -185,9 +184,8 @@ func (xaManager *XAResourceManager) BranchRollback(ctx context.Context, branchRe
 		return branch.BranchStatusPhasetwoRollbackFailedUnretryable, err
 	}
 
-	if rollbackErr := connectionProxyXA.XaRollbackByBranchId(ctx, xaID); rollbackErr != nil {
-		err := fmt.Errorf("rollback xa, resourceId: %s", branchResource.ResourceId)
-		log.Errorf(err.Error())
+	if err = connectionProxyXA.XaRollbackByBranchId(ctx, xaID); err != nil {
+		log.Errorf("rollback xa, resourceId: %s, err %v", branchResource.ResourceId, err)
 		setBranchStatus(xaID.String(), branch.BranchStatusPhasetwoRollbacked)
 		return branch.BranchStatusPhasetwoRollbackFailedUnretryable, err
 	}

pkg/remoting/processor/client/rm_branch_commit_processor.go

@@ -41,7 +41,7 @@ func (f *rmBranchCommitProcessor) Process(ctx context.Context, rpcMessage messag
 	branchID := request.BranchId
 	resourceID := request.ResourceId
 	applicationData := request.ApplicationData
-	log.Infof("Branch committing: xid %s, branchID %s, resourceID %s, applicationData %s", xid, branchID, resourceID, applicationData)
+	log.Infof("Branch committing: xid %s, branchID %d, resourceID %s, applicationData %s", xid, branchID, resourceID, applicationData)
 	branchResource := rm.BranchResource{
 		ResourceId:      resourceID,
 		BranchId:        branchID,

pkg/tm/transaction_executor.go

@@ -64,10 +64,11 @@ func WithGlobalTx(ctx context.Context, gc *GtxConfig, business CallbackWithCtx)
 
 	defer func() {
 		var err error
+		deferErr := recover()
 		// no need to do second phase if propagation is some type e.g. NotSupported.
 		if IsGlobalTx(ctx) {
 			// business maybe to throw panic, so need to recover it here.
-			if err = commitOrRollback(ctx, recover() == nil && re == nil); err != nil {
+			if err = commitOrRollback(ctx, deferErr == nil && re == nil); err != nil {
 				log.Errorf("global transaction xid %s, name %s second phase error", GetXID(ctx), GetTxName(ctx), err)
 			}
 		}