From 71f4aaa47034f658c54afce5daf849d4750f1553 Mon Sep 17 00:00:00 2001 From: xyctruth <398041993@qq.com> Date: Thu, 23 Jun 2022 11:59:43 +0800 Subject: [PATCH] grpc error reason --- dtmgrpc/type.go | 1 + test/busi/busi.go | 2 +- test/saga_grpc_test.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dtmgrpc/type.go b/dtmgrpc/type.go index bce24ba..14244e3 100644 --- a/dtmgrpc/type.go +++ b/dtmgrpc/type.go @@ -39,6 +39,7 @@ func GrpcError2DtmError(err error) error { if st.Message() == dtmcli.ResultOngoing { return dtmcli.ErrOngoing } + return fmt.Errorf("%s. %w", st.Message(), dtmcli.ErrFailure) } else if ok && st.Code() == codes.FailedPrecondition { return dtmcli.ErrOngoing diff --git a/test/busi/busi.go b/test/busi/busi.go index d6b30bc..81c9c9e 100644 --- a/test/busi/busi.go +++ b/test/busi/busi.go @@ -34,7 +34,7 @@ func handleGrpcBusiness(in *BusiReq, result1 string, result2 string, busi string if res == dtmcli.ResultSuccess { return nil } else if res == dtmcli.ResultFailure { - return status.New(codes.Aborted, fmt.Sprintf("reason:%s. %s", MainSwitch.FailureReason.Fetch(), dtmimp.ErrFailure)).Err() + return status.New(codes.Aborted, fmt.Sprintf("reason:%s", MainSwitch.FailureReason.Fetch())).Err() } else if res == dtmcli.ResultOngoing { return status.New(codes.FailedPrecondition, dtmcli.ResultOngoing).Err() } diff --git a/test/saga_grpc_test.go b/test/saga_grpc_test.go index 273dee6..9a98d06 100644 --- a/test/saga_grpc_test.go +++ b/test/saga_grpc_test.go @@ -36,7 +36,7 @@ func TestSagaGrpcRollback(t *testing.T) { cronTransOnce(t, gid) assert.Equal(t, StatusFailed, getTransStatus(saga.Gid)) assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid)) - assert.Equal(t, "url:localhost:58081/busi.Busi/TransIn return failed: reason:Insufficient balance. FAILURE. FAILURE", getTrans(saga.Gid).RollbackReason) + assert.Equal(t, "url:localhost:58081/busi.Busi/TransIn return failed: reason:Insufficient balance. FAILURE", getTrans(saga.Gid).RollbackReason) } func TestSagaGrpcCurrent(t *testing.T) {