tsai
/
dtm
mirror of https://github.com/dtm-labs/dtm.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

waitTransProcessed ref

pull/45/head
yedf2 4 years ago
parent
74479f7a20
commit
2ee5fc4543
15 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      test/barrier_saga_test.go
  2. 4
      test/barrier_tcc_test.go
  3. 4
      test/dtmsvr_test.go
  4. 4
      test/grpc_barrier_saga_test.go
  5. 2
      test/grpc_msg_test.go
  6. 6
      test/grpc_saga_test.go
  7. 2
      test/grpc_tcc_test.go
  8. 4
      test/grpc_xa_test.go
  9. 2
      test/msg_test.go
  10. 8
      test/saga_concurrent_test.go
  11. 10
      test/saga_test.go
  12. 2
      test/tcc_test.go
  13. 6
      test/types.go
  14. 6
      test/wait_saga_test.go
  15. 6
      test/xa_test.go

4
test/barrier_saga_test.go
View File

@ -22,7 +22,7 @@ func sagaBarrierNormal(t *testing.T) {
dtmcli.Logf("busi trans submit")
err := saga.Submit()
e2p(err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
}
@ -33,6 +33,6 @@ func sagaBarrierRollback(t *testing.T) {
dtmcli.Logf("busi trans submit")
err := saga.Submit()
e2p(err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))
}

4
test/barrier_tcc_test.go
View File

@ -31,7 +31,7 @@ func tccBarrierRollback(t *testing.T) {
return tcc.CallBranch(&examples.TransReq{Amount: 30, TransInResult: dtmcli.ResultFailure}, Busi+"/TccBTransInTry", Busi+"/TccBTransInConfirm", Busi+"/TccBTransInCancel")
})
assert.Error(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(gid))
}
@ -43,7 +43,7 @@ func tccBarrierNormal(t *testing.T) {
return tcc.CallBranch(&examples.TransReq{Amount: 30}, Busi+"/TccBTransInTry", Busi+"/TccBTransInConfirm", Busi+"/TccBTransInCancel")
})
assert.Nil(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(gid))
}

4
test/dtmsvr_test.go
View File

@ -44,7 +44,7 @@ func getBranchesStatus(gid string) []string {
}
func assertSucceed(t *testing.T, gid string) {
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(gid))
}
@ -88,7 +88,7 @@ func TestUpdateBranchAsync(t *testing.T) {
saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
err := saga.Submit()
assert.Nil(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
time.Sleep(dtmsvr.UpdateBranchAsyncInterval)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(saga.Gid))

4
test/grpc_barrier_saga_test.go
View File

@ -22,7 +22,7 @@ func grpcSagaBarrierNormal(t *testing.T) {
Add(examples.BusiGrpc+"/examples.Busi/TransInBSaga", examples.BusiGrpc+"/examples.Busi/TransInRevertBSaga", req)
err := saga.Submit()
e2p(err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
}
@ -33,7 +33,7 @@ func grpcSagaBarrierRollback(t *testing.T) {
Add(examples.BusiGrpc+"/examples.Busi/TransInBSaga", examples.BusiGrpc+"/examples.Busi/TransInRevertBSaga", req)
err := saga.Submit()
e2p(err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusFailed}, getBranchesStatus(saga.Gid))
}

2
test/grpc_msg_test.go
View File

@ -19,7 +19,7 @@ func grpcMsgNormal(t *testing.T) {
msg := genGrpcMsg("grpc-msg-normal")
err := msg.Submit()
assert.Nil(t, err)
WaitTransProcessed(msg.Gid)
waitTransProcessed(msg.Gid)
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(msg.Gid))
}

6
test/grpc_saga_test.go
View File

@ -18,7 +18,7 @@ func TestGrpcSaga(t *testing.T) {
func sagaGrpcNormal(t *testing.T) {
saga := genSagaGrpc("gid-sagaGrpcNormal", false, false)
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(saga.Gid))
transQuery(t, saga.Gid)
@ -28,7 +28,7 @@ func sagaGrpcCommittedOngoing(t *testing.T) {
saga := genSagaGrpc("gid-committedOngoingGrpc", false, false)
examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing)
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared}, getBranchesStatus(saga.Gid))
cronTransOnce()
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
@ -39,7 +39,7 @@ func sagaGrpcRollback(t *testing.T) {
saga := genSagaGrpc("gid-rollbackSaga2Grpc", false, true)
examples.MainSwitch.TransOutRevertResult.SetOnce(dtmcli.ResultOngoing)
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusAborting, getTransStatus(saga.Gid))
cronTransOnce()
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))

2
test/grpc_tcc_test.go
View File

@ -58,7 +58,7 @@ func tccGrpcRollback(t *testing.T) {
return err
})
assert.Error(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, dtmcli.StatusAborting, getTransStatus(gid))
cronTransOnce()
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(gid))

4
test/grpc_xa_test.go
View File

@ -51,7 +51,7 @@ func xaGrpcNormal(t *testing.T) {
return err
})
assert.Equal(t, nil, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(gid))
}
@ -68,7 +68,7 @@ func xaGrpcRollback(t *testing.T) {
return err
})
assert.Error(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusPrepared}, getBranchesStatus(gid))
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(gid))
}

2
test/msg_test.go
View File

@ -19,7 +19,7 @@ func msgNormal(t *testing.T) {
msg := genMsg("gid-msg-normal")
msg.Submit()
assert.Equal(t, dtmcli.StatusSubmitted, getTransStatus(msg.Gid))
WaitTransProcessed(msg.Gid)
waitTransProcessed(msg.Gid)
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusSucceed}, getBranchesStatus(msg.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(msg.Gid))
cronTransOnce()

8
test/saga_concurrent_test.go
View File

@ -28,7 +28,7 @@ func genCSaga(gid string, outFailed bool, inFailed bool) *dtmcli.Saga {
func csagaNormal(t *testing.T) {
csaga := genCSaga("gid-noraml-csaga", false, false)
csaga.Submit()
WaitTransProcessed(csaga.Gid)
waitTransProcessed(csaga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(csaga.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(csaga.Gid))
}
@ -38,7 +38,7 @@ func csagaRollback(t *testing.T) {
examples.MainSwitch.TransOutRevertResult.SetOnce(dtmcli.ResultOngoing)
err := csaga.Submit()
assert.Nil(t, err)
WaitTransProcessed(csaga.Gid)
waitTransProcessed(csaga.Gid)
assert.Equal(t, dtmcli.StatusAborting, getTransStatus(csaga.Gid))
cronTransOnce()
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(csaga.Gid))
@ -52,7 +52,7 @@ func csagaRollback2(t *testing.T) {
csaga.AddStepOrder(1, []int{0})
err := csaga.Submit()
assert.Nil(t, err)
WaitTransProcessed(csaga.Gid)
waitTransProcessed(csaga.Gid)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(csaga.Gid))
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusFailed, dtmcli.StatusPrepared, dtmcli.StatusPrepared}, getBranchesStatus(csaga.Gid))
err = csaga.Submit()
@ -63,7 +63,7 @@ func csagaCommittedOngoing(t *testing.T) {
csaga := genCSaga("gid-committed-ongoing-csaga", false, false)
examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing)
csaga.Submit()
WaitTransProcessed(csaga.Gid)
waitTransProcessed(csaga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(csaga.Gid))
assert.Equal(t, dtmcli.StatusSubmitted, getTransStatus(csaga.Gid))

10
test/saga_test.go
View File

@ -19,7 +19,7 @@ func TestSaga(t *testing.T) {
func sagaNormal(t *testing.T) {
saga := genSaga("gid-noramlSaga", false, false)
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(saga.Gid))
transQuery(t, saga.Gid)
@ -31,7 +31,7 @@ func sagaCommittedOngoing(t *testing.T) {
saga := genSaga("gid-committedOngoing", false, false)
examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing)
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared}, getBranchesStatus(saga.Gid))
cronTransOnce()
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
@ -43,7 +43,7 @@ func sagaRollback(t *testing.T) {
examples.MainSwitch.TransOutRevertResult.SetOnce("ERROR")
err := saga.Submit()
assert.Nil(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusAborting, getTransStatus(saga.Gid))
cronTransOnce()
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))
@ -58,7 +58,7 @@ func sagaRollback2(t *testing.T) {
examples.MainSwitch.TransInResult.SetOnce(dtmcli.ResultOngoing)
err := saga.Submit()
assert.Nil(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
cronTransOnceForwardNow(3600)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusPrepared}, getBranchesStatus(saga.Gid))
@ -69,7 +69,7 @@ func sagaTimeout(t *testing.T) {
saga.TimeoutToFail = 1800
examples.MainSwitch.TransOutResult.SetOnce("UNKOWN")
saga.Submit()
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusSubmitted, getTransStatus(saga.Gid))
cronTransOnceForwardNow(3600)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))

2
test/tcc_test.go
View File

@ -36,7 +36,7 @@ func tccRollback(t *testing.T) {
return tcc.CallBranch(data, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
})
assert.Error(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, dtmcli.StatusAborting, getTransStatus(gid))
cronTransOnce()
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(gid))

6
test/types.go
View File

@ -14,8 +14,8 @@ func dbGet() *common.DB {
return common.DbGet(config.DB)
}
// WaitTransProcessed only for test usage. wait for transaction processed once
func WaitTransProcessed(gid string) {
// waitTransProcessed only for test usage. wait for transaction processed once
func waitTransProcessed(gid string) {
dtmcli.Logf("waiting for gid %s", gid)
select {
case id := <-dtmsvr.TransProcessedTestChan:
@ -32,7 +32,7 @@ func WaitTransProcessed(gid string) {
func cronTransOnce() {
gid := dtmsvr.CronTransOnce()
if dtmsvr.TransProcessedTestChan != nil && gid != "" {
WaitTransProcessed(gid)
waitTransProcessed(gid)
}
}

6
test/wait_saga_test.go
View File

@ -20,7 +20,7 @@ func sagaNormalWait(t *testing.T) {
saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
err := saga.Submit()
assert.Nil(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
assert.Equal(t, dtmcli.StatusSucceed, getTransStatus(saga.Gid))
transQuery(t, saga.Gid)
@ -32,7 +32,7 @@ func sagaCommittedOngoingWait(t *testing.T) {
saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
err := saga.Submit()
assert.Error(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared, dtmcli.StatusPrepared}, getBranchesStatus(saga.Gid))
cronTransOnce()
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(saga.Gid))
@ -44,7 +44,7 @@ func sagaRollbackWait(t *testing.T) {
saga.SetOptions(&dtmcli.TransOptions{WaitResult: true})
err := saga.Submit()
assert.Error(t, err)
WaitTransProcessed(saga.Gid)
waitTransProcessed(saga.Gid)
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(saga.Gid))
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusSucceed, dtmcli.StatusFailed}, getBranchesStatus(saga.Gid))
}

6
test/xa_test.go
View File

@ -39,7 +39,7 @@ func xaNormal(t *testing.T) {
return xa.CallBranch(req, examples.Busi+"/TransInXa")
})
assert.Equal(t, nil, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(gid))
}
@ -57,7 +57,7 @@ func xaDuplicate(t *testing.T) {
return xa.CallBranch(req, examples.Busi+"/TransInXa")
})
assert.Equal(t, nil, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, []string{dtmcli.StatusPrepared, dtmcli.StatusSucceed, dtmcli.StatusPrepared, dtmcli.StatusSucceed}, getBranchesStatus(gid))
}
func xaRollback(t *testing.T) {
@ -72,7 +72,7 @@ func xaRollback(t *testing.T) {
return xa.CallBranch(req, examples.Busi+"/TransInXa")
})
assert.Error(t, err)
WaitTransProcessed(gid)
waitTransProcessed(gid)
assert.Equal(t, []string{dtmcli.StatusSucceed, dtmcli.StatusPrepared}, getBranchesStatus(gid))
assert.Equal(t, dtmcli.StatusFailed, getTransStatus(gid))
}

Write Preview
Loading…
Cancel
Save