fix:timeout config & panic log lost

pkg/datasource/sql/conn_at.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	gosql "database/sql"
 	"database/sql/driver"
+	"github.com/seata/seata-go/pkg/util/log"
 
 	"github.com/seata/seata-go/pkg/datasource/sql/exec"
 	"github.com/seata/seata-go/pkg/datasource/sql/types"
@@ -165,10 +166,13 @@ func (c *ATConn) createNewTxOnExecIfNeed(ctx context.Context, f func() (types.Ex
 			return nil, err
 		}
 	}
-
 	defer func() {
-		if tx != nil {
-			tx.Rollback()
+		if recoverErr := recover(); recoverErr != nil {
+			log.Errorf("conn at rollback  panic:%v", recoverErr)
+			if tx != nil {
+				rollbackErr := tx.Rollback()
+				log.Errorf("conn at rollback error:%v", rollbackErr)
+			}
 		}
 	}()
 

pkg/rm/tcc/tcc_service.go

@@ -244,7 +244,7 @@ func obtainStructValueType(o interface{}) (bool, reflect.Value, reflect.Type) {
 func (t *TCCServiceProxy) GetTransactionInfo() tm.TransactionInfo {
 	// todo replace with config
 	return tm.TransactionInfo{
-		TimeOut: 10000,
+		TimeOut: time.Second * 10,
 		Name:    t.GetActionName(),
 		// Propagation, Propagation
 		// LockRetryInternal, int64

pkg/rm/tcc/tcc_service_test.go

@@ -309,7 +309,7 @@ func TestTCCGetTransactionInfo(t1 *testing.T) {
 				TwoPhaseAction:  twoPhaseAction1,
 			},
 		},
-		tm.TransactionInfo{Name: "TwoPhaseDemoService", TimeOut: 10000, Propagation: 0, LockRetryInternal: 0, LockRetryTimes: 0},
+		tm.TransactionInfo{Name: "TwoPhaseDemoService", TimeOut: time.Second * 10, Propagation: 0, LockRetryInternal: 0, LockRetryTimes: 0},
 	}
 
 	t1.Run(tests.name, func(t1 *testing.T) {

pkg/tm/transaction_executor.go

@@ -28,8 +28,10 @@ import (
 	"github.com/seata/seata-go/pkg/util/log"
 )
 
+const DefaultTimeOut = time.Second * 30
+
 type TransactionInfo struct {
-	TimeOut           int32
+	TimeOut           time.Duration
 	Name              string
 	Propagation       Propagation
 	LockRetryInternal int64
@@ -48,12 +50,16 @@ func WithGlobalTx(ctx context.Context, ti *TransactionInfo, business CallbackWit
 		return errors.New("global transaction name is required.")
 	}
 
-	if ctx, re = begin(ctx, ti.Name); re != nil {
+	if ctx, re = begin(ctx, ti); re != nil {
 		return
 	}
 	defer func() {
 		// business maybe to throw panic, so need to recover it here.
-		re = commitOrRollback(ctx, recover() == nil && re == nil)
+		err := recover()
+		if err != nil {
+			log.Errorf("business callback panic:%v", err)
+		}
+		re = commitOrRollback(ctx, err == nil && re == nil)
 		log.Infof("global transaction result %v", re)
 	}()
 
@@ -63,12 +69,18 @@ func WithGlobalTx(ctx context.Context, ti *TransactionInfo, business CallbackWit
 }
 
 // begin a global transaction, it will obtain a xid from tc in tcp call.
-func begin(ctx context.Context, name string) (rc context.Context, re error) {
+func begin(ctx context.Context, ti *TransactionInfo) (rc context.Context, re error) {
+	if ti == nil {
+		return nil, errors.New("transaction info is nil")
+	}
+	if ti.TimeOut == 0 {
+		ti.TimeOut = DefaultTimeOut
+	}
 	if !IsSeataContext(ctx) {
 		ctx = InitSeataContext(ctx)
 	}
 
-	SetTxName(ctx, name)
+	SetTxName(ctx, ti.Name)
 	if GetTransactionRole(ctx) == nil {
 		SetTransactionRole(ctx, LAUNCHER)
 	}
@@ -93,8 +105,7 @@ func begin(ctx context.Context, name string) (rc context.Context, re error) {
 		SetTxStatus(ctx, message.GlobalStatusUnKnown)
 	}
 
-	// todo timeout should read from config
-	err := GetGlobalTransactionManager().Begin(ctx, tx, time.Second*30, name)
+	err := GetGlobalTransactionManager().Begin(ctx, tx, ti.TimeOut, ti.Name)
 	if err != nil {
 		re = fmt.Errorf("transactionTemplate: begin transaction failed, error %v", err)
 	}

pkg/tm/transaction_executor_test.go

@@ -85,7 +85,9 @@ func TestTransactionExecutorBegin(t *testing.T) {
 					assert.Equal(t, v.wantErrString, err.Error)
 				}
 			}(v)
-			begin(v.ctx, v.name)
+			begin(v.ctx, &TransactionInfo{
+				Name: v.name,
+			})
 		}()
 
 		// rest up stub

sample/at/basic/main.go

@@ -40,7 +40,8 @@ func main() {
 	initService()
 	selectData()
 	tm.WithGlobalTx(context.Background(), &tm.TransactionInfo{
-		Name: "ATSampleLocalGlobalTx",
+		Name:    "ATSampleLocalGlobalTx",
+		TimeOut: time.Second * 30,
 	}, updateData)
 	<-make(chan struct{})
 }