database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

distask: refine dispatcher test (#45821)

Browse Source 
close pingcap/tidb#45788
This commit is contained in:
EasonBall
2023-08-04 18:13:18 +08:00
committed by GitHub
parent 3fa6b94494
commit 64450c2ab5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
disttask/framework/dispatcher/dispatcher_test.go
View File

@ -178,16 +178,16 @@ func checkDispatch(t *testing.T, taskCnt int, isSucc bool, isCancel bool) {
// 3s
cnt := 60
checkGetRunningTaskCnt := func() {
checkGetRunningTaskCnt := func(expected int) {
var retCnt int
for i := 0; i < cnt; i++ {
retCnt = dsp.GetRunningTaskCnt()
if retCnt == taskCnt {
if retCnt == expected {
break
}
time.Sleep(time.Millisecond * 50)
}
require.Equal(t, retCnt, taskCnt)
require.Equal(t, retCnt, expected)
}
checkTaskRunningCnt := func() []*proto.Task {
@ -215,7 +215,7 @@ func checkDispatch(t *testing.T, taskCnt int, isSucc bool, isCancel bool) {
taskIDs = append(taskIDs, taskID)
}
// test normal flow
checkGetRunningTaskCnt()
checkGetRunningTaskCnt(taskCnt)
tasks := checkTaskRunningCnt()
for i, taskID := range taskIDs {
require.Equal(t, int64(i+1), tasks[i].ID)
@ -227,7 +227,7 @@ func checkDispatch(t *testing.T, taskCnt int, isSucc bool, isCancel bool) {
if taskCnt == 1 {
taskID, err := mgr.AddNewGlobalTask(fmt.Sprintf("%d", taskCnt), taskTypeExample, 0, nil)
require.NoError(t, err)
checkGetRunningTaskCnt()
checkGetRunningTaskCnt(taskCnt)
// Clean the task.
deleteTasks(t, store, taskID)
dsp.DelRunningTask(taskID)
@ -254,7 +254,8 @@ func checkDispatch(t *testing.T, taskCnt int, isSucc bool, isCancel bool) {
}
checkGetTaskState(proto.TaskStateSucceed)
require.Len(t, tasks, taskCnt)
require.Equal(t, 0, dsp.GetRunningTaskCnt())
checkGetRunningTaskCnt(0)
return
}
@ -286,7 +287,7 @@ func checkDispatch(t *testing.T, taskCnt int, isSucc bool, isCancel bool) {
}
checkGetTaskState(proto.TaskStateReverted)
require.Len(t, tasks, taskCnt)
require.Equal(t, 0, dsp.GetRunningTaskCnt())
checkGetRunningTaskCnt(0)
}
func TestSimpleNormalFlow(t *testing.T) {