disttask: fix hang in make ut #49406

ywqzzy · 2023-12-13T05:19:08Z

What problem does this PR solve?

Issue Number: close #49405

Problem Summary:

What changed and how does it work?

set tasks in ut with 1 concurrency

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

Performance regression: Consumes more CPU
Performance regression: Consumes more Memory
Breaking backward compatibility

Documentation

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

tiprow · 2023-12-13T05:19:28Z

Hi @ywqzzy. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Benjamin2037

LGTM

ti-chi-bot · 2023-12-13T05:23:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, Defined2014

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/disttask/OWNERS~~ [Benjamin2037]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ti-chi-bot · 2023-12-13T05:23:51Z

[LGTM Timeline notifier]

Timeline:

2023-12-13 05:22:42.499808544 +0000 UTC m=+420053.537035470: ☑️ agreed by Defined2014.
2023-12-13 05:23:50.581063148 +0000 UTC m=+420121.618290072: ☑️ agreed by Benjamin2037.

ywqzzy · 2023-12-13T05:24:16Z

/hold

codecov · 2023-12-13T05:26:49Z

Codecov Report

Merging #49406 (8da0d12) into master (9f612e3) will increase coverage by 0.6771%.
Report is 6 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #49406        +/-   ##
================================================
+ Coverage   71.0543%   71.7314%   +0.6771%     
================================================
  Files          1368       1414        +46     
  Lines        401324     414963     +13639     
================================================
+ Hits         285158     297659     +12501     
- Misses        96340      98498      +2158     
+ Partials      19826      18806      -1020

Flag	Coverage Δ
integration	`43.6413% <ø> (?)`
unit	`71.0543% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`53.9663% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`47.9117% <ø> (-4.9818%)`	⬇️

D3Hunter · 2023-12-13T05:28:31Z

pkg/disttask/framework/testutil/disttest_util.go

@@ -119,7 +119,7 @@ func RegisterRollbackTaskMeta(t *testing.T, ctrl *gomock.Controller, mockDispatc
 func DispatchTask(ctx context.Context, t *testing.T, taskKey string) *proto.Task {
 	mgr, err := storage.GetTaskManager()
 	require.NoError(t, err)
-	_, err = mgr.CreateTask(ctx, taskKey, proto.TaskTypeExample, 8, nil)
+	_, err = mgr.CreateTask(ctx, taskKey, proto.TaskTypeExample, 1, nil)


maybe add this failpoint to all those case

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", `return(1)`))

ywqzzy · 2023-12-13T05:40:32Z

/unhold

ywqzzy · 2023-12-13T05:43:36Z

/hold

ywqzzy · 2023-12-13T05:59:55Z

/unhold

D3Hunter · 2023-12-13T06:01:09Z

pkg/disttask/framework/testutil/context.go

@@ -41,6 +43,10 @@ func InitTestContext(t *testing.T, nodeNum int) (context.Context, *gomock.Contro
 	defer ctrl.Finish()
 	ctx := context.Background()
 	ctx = util.WithInternalSourceType(ctx, "scheduler")
+	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(1)"))


Suggested change

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(1)"))

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(8)"))

i remember there're tasks of currency = 4

D3Hunter · 2023-12-13T06:01:33Z

pkg/disttask/framework/testutil/disttest_util.go

this part can be reverted

fix hang

4b92d1d

ti-chi-bot bot added do-not-merge/invalid-title do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 13, 2023

ywqzzy changed the title ~~fix hang~~ disttask: fix hang in make ut Dec 13, 2023

ti-chi-bot bot removed the do-not-merge/invalid-title label Dec 13, 2023

ti-chi-bot bot removed the do-not-merge/needs-tests-checked label Dec 13, 2023

Defined2014 approved these changes Dec 13, 2023

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 13, 2023

Benjamin2037 approved these changes Dec 13, 2023

View reviewed changes

ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 13, 2023

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2023

more test

59b3e76

D3Hunter reviewed Dec 13, 2023

View reviewed changes

use failpoint instead of runtime

4cf4ab4

ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2023

u

7c55732

ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2023

fix

1cda5dc

ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2023

D3Hunter reviewed Dec 13, 2023

View reviewed changes

pkg/disttask/framework/testutil/disttest_util.go Outdated

Copy link

Contributor

D3Hunter Dec 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this part can be reverted

fix

eca1c21

ywqzzy force-pushed the fix_ut_hang branch from 190c7a4 to eca1c21 Compare December 13, 2023 06:09

ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 13, 2023

r

f2f1517

ywqzzy force-pushed the fix_ut_hang branch from 1ef0109 to f2f1517 Compare December 13, 2023 07:24

Merge branch 'master' into fix_ut_hang

8da0d12

ti-chi-bot bot merged commit f7d2de0 into pingcap:master Dec 13, 2023

ywqzzy mentioned this pull request Jan 16, 2024

Enhance distributed task execution framework 2.0 #48795

Closed

31 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

disttask: fix hang in make ut #49406

disttask: fix hang in make ut #49406

ywqzzy commented Dec 13, 2023 •

edited

Loading

tiprow bot commented Dec 13, 2023

Benjamin2037 left a comment

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

ywqzzy commented Dec 13, 2023

codecov bot commented Dec 13, 2023 •

edited

Loading

D3Hunter Dec 13, 2023

ywqzzy commented Dec 13, 2023

ywqzzy commented Dec 13, 2023

ywqzzy commented Dec 13, 2023

D3Hunter Dec 13, 2023

D3Hunter Dec 13, 2023

	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(1)"))
	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(8)"))

disttask: fix hang in make ut #49406

disttask: fix hang in make ut #49406

Conversation

ywqzzy commented Dec 13, 2023 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Dec 13, 2023

Benjamin2037 left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Dec 13, 2023

ti-chi-bot bot commented Dec 13, 2023

[LGTM Timeline notifier]

ywqzzy commented Dec 13, 2023

codecov bot commented Dec 13, 2023 • edited Loading

Codecov Report

D3Hunter Dec 13, 2023

Choose a reason for hiding this comment

ywqzzy commented Dec 13, 2023

ywqzzy commented Dec 13, 2023

ywqzzy commented Dec 13, 2023

D3Hunter Dec 13, 2023

Choose a reason for hiding this comment

D3Hunter Dec 13, 2023

Choose a reason for hiding this comment

ywqzzy commented Dec 13, 2023 •

edited

Loading

codecov bot commented Dec 13, 2023 •

edited

Loading