From be45d1d530eaa27e663ecef9141259e466236ca3 Mon Sep 17 00:00:00 2001 From: liulei Date: Tue, 22 Feb 2022 09:47:38 +0800 Subject: [PATCH] revert: undo request timeout test sleep operation --- dtmsvr/trans_type_saga.go | 6 +----- test/busi/base_http.go | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dtmsvr/trans_type_saga.go b/dtmsvr/trans_type_saga.go index 6caacf0..0c2da0d 100644 --- a/dtmsvr/trans_type_saga.go +++ b/dtmsvr/trans_type_saga.go @@ -170,10 +170,6 @@ func (t *transSagaProcessor) ProcessOnce(branches []TransBranch) error { } } waitDoneOnce := func() { - timeAfter := time.Second * 3 - if t.RequestTimeout != 0 { - timeAfter = time.Duration(t.RequestTimeout) * time.Second - } select { case r := <-resultChan: br := &branchResults[r.index] @@ -192,7 +188,7 @@ func (t *transSagaProcessor) ProcessOnce(branches []TransBranch) error { } } logger.Debugf("branch done: %v", r) - case <-time.After(timeAfter): + case <-time.After(time.Second * 3): logger.Debugf("wait once for done") } } diff --git a/test/busi/base_http.go b/test/busi/base_http.go index 28fa8cf..0c7adde 100644 --- a/test/busi/base_http.go +++ b/test/busi/base_http.go @@ -10,8 +10,6 @@ import ( "database/sql" "errors" "fmt" - "time" - "github.com/dtm-labs/dtm/dtmcli" "github.com/dtm-labs/dtm/dtmcli/dtmimp" "github.com/dtm-labs/dtm/dtmcli/logger" @@ -154,7 +152,6 @@ func BaseAddRoute(app *gin.Engine) { }) })) app.POST(BusiAPI+"/TransOutTimeout", dtmutil.WrapHandler2(func(c *gin.Context) interface{} { - time.Sleep(time.Second * 4) return handleGeneralBusiness(c, MainSwitch.TransOutResult.Fetch(), reqFrom(c).TransOutResult, "TransOut") })) app.POST(BusiAPI+"/TransInTccNested", dtmutil.WrapHandler2(func(c *gin.Context) interface{} {