saga submit sync get branch error

dtmgrpc/type.go

@@ -8,6 +8,7 @@ package dtmgrpc
 
 import (
 	context "context"
+	"errors"
 	"fmt"
 
 	"github.com/dtm-labs/dtm/dtmcli"
@@ -23,9 +24,9 @@ import (
 // DtmError2GrpcError translate dtm error to grpc error
 func DtmError2GrpcError(res interface{}) error {
 	e, ok := res.(error)
-	if ok && e == dtmimp.ErrFailure {
-		return status.New(codes.Aborted, dtmcli.ResultFailure).Err()
-	} else if ok && e == dtmimp.ErrOngoing {
+	if ok && errors.Is(e, dtmimp.ErrFailure) {
+		return status.New(codes.Aborted, e.Error()).Err()
+	} else if ok && errors.Is(e, dtmimp.ErrOngoing) {
 		return status.New(codes.FailedPrecondition, dtmcli.ResultOngoing).Err()
 	}
 	return e

dtmsvr/trans_process.go

@@ -48,7 +48,7 @@ func (t *TransGlobal) process(branches []TransBranch) error {
 
 	if submitting && t.Status != dtmcli.StatusSucceed {
 		if t.RollbackReason != "" {
-			return fmt.Errorf(t.RollbackReason)
+			return fmt.Errorf("%s. %w", t.RollbackReason, dtmcli.ErrFailure)
 		}
 		return fmt.Errorf("wait result not return success: %w", dtmcli.ErrFailure)
 	}

test/saga_grpc_test.go

@@ -123,6 +123,20 @@ func TestSagaGrpcWithGlobalTransRequestTimeout(t *testing.T) {
 	waitTransProcessed(gid)
 }
 
+func TestSagaGrpcOptionsRollbackWait(t *testing.T) {
+	gid := dtmimp.GetFuncName()
+	saga := genSagaGrpc(gid, false, true)
+	busi.MainSwitch.FailureReason.SetOnce("Insufficient balance")
+	saga.WaitResult = true
+	err := saga.Submit()
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Insufficient balance")
+	waitTransProcessed(saga.Gid)
+	assert.Equal(t, StatusFailed, getTransStatus(saga.Gid))
+	assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid))
+	assert.Contains(t, getTrans(saga.Gid).RollbackReason, "Insufficient balance")
+}
+
 func TestSagaGrpcCronPassthroughHeadersYes(t *testing.T) {
 	gidYes := dtmimp.GetFuncName()
 	sagaYes := dtmgrpc.NewSagaGrpc(dtmutil.DefaultGrpcServer, gidYes)

test/saga_options_test.go

@@ -106,6 +106,7 @@ func TestSagaOptionsRollbackWait(t *testing.T) {
 	waitTransProcessed(saga.Gid)
 	assert.Equal(t, StatusFailed, getTransStatus(saga.Gid))
 	assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid))
+	assert.Contains(t, getTrans(saga.Gid).RollbackReason, "Insufficient balance")
 }
 
 func TestSagaPassthroughHeadersYes(t *testing.T) {