msg passed

dtmcli/dtmimp/trans_base.go

@@ -106,8 +106,8 @@ func TransRegisterBranch(tb *TransBase, added map[string]string, operation strin
 	return TransCallDtm(tb, m, operation)
 }
 
-// TransRequestBranch TransBAse request branch result
-func TransRequestBranch(t *TransBase, body interface{}, branchID string, op string, url string) (*resty.Response, error) {
+// TransRequestBranch TransBase request branch result
+func TransRequestBranch(t *TransBase, method string, body interface{}, branchID string, op string, url string) (*resty.Response, error) {
 	resp, err := RestyClient.R().
 		SetBody(body).
 		SetQueryParams(map[string]string{
@@ -118,7 +118,7 @@ func TransRequestBranch(t *TransBase, body interface{}, branchID string, op stri
 			"op":         op,
 		}).
 		SetHeaders(t.BranchHeaders).
-		Post(url)
+		Execute(method, url)
 	if err == nil {
 		err = RespAsErrorCompatible(resp)
 	}

dtmcli/msg.go

@@ -8,6 +8,7 @@ package dtmcli
 
 import (
 	"database/sql"
+	"errors"
 
 	"github.com/dtm-labs/dtm/dtmcli/dtmimp"
 )
@@ -55,10 +56,10 @@ func (s *Msg) PrepareAndSubmitBarrier(queryPrepared string, busiCall func(bb *Br
 	}
 	if err == nil {
 		err = busiCall(bb)
-		if err != nil && err != ErrFailure {
-			_, err = dtmimp.TransRequestBranch(&s.TransBase, nil, bb.BranchID, bb.Op, queryPrepared)
+		if err != nil && !errors.Is(err, ErrFailure) {
+			_, err = dtmimp.TransRequestBranch(&s.TransBase, "GET", nil, bb.BranchID, bb.Op, queryPrepared)
 		}
-		if err == ErrFailure {
+		if errors.Is(err, ErrFailure) {
 			_ = dtmimp.TransCallDtm(&s.TransBase, s, "abort")
 		}
 	}

dtmcli/tcc.go

@@ -75,5 +75,5 @@ func (t *Tcc) CallBranch(body interface{}, tryURL string, confirmURL string, can
 	if err != nil {
 		return nil, err
 	}
-	return dtmimp.TransRequestBranch(&t.TransBase, body, branchID, BranchTry, tryURL)
+	return dtmimp.TransRequestBranch(&t.TransBase, "POST", body, branchID, BranchTry, tryURL)
 }

dtmcli/xa.go

@@ -101,5 +101,5 @@ func (xc *XaClient) XaGlobalTransaction2(gid string, custom func(*Xa), xaFunc Xa
 // CallBranch call a xa branch
 func (x *Xa) CallBranch(body interface{}, url string) (*resty.Response, error) {
 	branchID := x.NewSubBranchID()
-	return dtmimp.TransRequestBranch(&x.TransBase, body, branchID, BranchAction, url)
+	return dtmimp.TransRequestBranch(&x.TransBase, "POST", body, branchID, BranchAction, url)
 }

test/msg_barrier_test.go

@@ -99,7 +99,7 @@ func TestMsgPrepareAndSubmitCommitAfterFailed(t *testing.T) {
 		})
 		return err
 	})
-	assert.Error(t, err)
-	cronTransOnceForwardNow(180)
+	assert.Nil(t, err) // final commit will ignore error after submit
+	waitTransProcessed(gid)
 	assertNotSameBalance(t, before, "mysql")
 }