Browse Source

saga submit sync get branch error

pull/322/head
xyctruth 4 years ago
parent
commit
6356090bd0
  1. 4
      dtmsvr/trans_process.go
  2. 2
      test/saga_grpc_test.go
  3. 2
      test/saga_options_test.go
  4. 2
      test/saga_test.go

4
dtmsvr/trans_process.go

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

2
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", getTrans(saga.Gid).RollbackReason)
assert.Contains(t, getTrans(saga.Gid).RollbackReason, "Insufficient balance")
}
func TestSagaGrpcCurrent(t *testing.T) {

2
test/saga_options_test.go

@ -98,9 +98,11 @@ func TestSagaOptionsCommittedOngoingWait(t *testing.T) {
func TestSagaOptionsRollbackWait(t *testing.T) {
saga := genSaga(dtmimp.GetFuncName(), 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))

2
test/saga_test.go

@ -33,7 +33,7 @@ func TestSagaRollback(t *testing.T) {
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid))
assert.Equal(t, StatusFailed, getTransStatus(saga.Gid))
assert.Equal(t, "url:http://localhost:8081/api/busi/TransIn return failed: {\"error\":\"reason:Insufficient balance. FAILURE\"}. FAILURE", getTrans(saga.Gid).RollbackReason)
assert.Contains(t, getTrans(saga.Gid).RollbackReason, "Insufficient balance")
}
func TestSagaOngoingSucceed(t *testing.T) {

Loading…
Cancel
Save