br: fix flaky test `TestConcurrentLock` #57591

YuJuncen · 2024-11-21T09:15:28Z

What problem does this PR solve?

Issue Number: ref #56523

Problem Summary:
The test case TestConcurrentLock isn't stable enough.

What changed and how does it work?

Make it more stable by stronger syncing.

# go test -count 2000 -run '^TestConcurrentLock$' github.com/pingcap/tidb/br/pkg/storage
ok      github.com/pingcap/tidb/br/pkg/storage  9.397s

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test

It is a test.

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 · 2024-11-21T09:15:46Z

Hi @YuJuncen. 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-sigs/prow repository.

codecov · 2024-11-21T09:37:27Z

Codecov Report

Attention: Patch coverage is 51.61290% with 15 lines in your changes missing coverage. Please review.

Project coverage is 74.7555%. Comparing base (d0de86b) to head (4c93260).
Report is 49 commits behind head on master.

Additional details and impacted files

@@               Coverage Diff                @@
##             master     #57591        +/-   ##
================================================
+ Coverage   72.8369%   74.7555%   +1.9186%     
================================================
  Files          1677       1731        +54     
  Lines        464141     480712     +16571     
================================================
+ Hits         338066     359359     +21293     
+ Misses       105185      98916      -6269     
- Partials      20890      22437      +1547

Flag	Coverage Δ
integration	`49.1777% <51.6129%> (?)`
unit	`72.2593% <51.6129%> (+0.0156%)`	⬆️

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

Components	Coverage Δ
dumpling	`52.7673% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`59.7276% <51.6129%> (+14.0330%)`	⬆️

Tristan1900

LGTM!

br/pkg/storage/local.go

ti-chi-bot · 2024-11-21T15:11:12Z

@Tristan1900: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

LGTM!

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-sigs/prow repository.

YuJuncen · 2024-11-22T04:39:08Z

/test unit-test

hawkingrei · 2024-11-22T13:23:05Z

/retest

YuJuncen · 2024-11-27T05:50:57Z

/test unit-test

tiprow · 2024-11-27T05:51:18Z

@YuJuncen: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test unit-test

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-sigs/prow repository.

hawkingrei · 2024-11-27T06:10:06Z

/test all

Signed-off-by: hillium <yujuncen@pingcap.com>

lance6716

/hold

free to unhold

lance6716 · 2024-11-27T06:22:27Z

br/pkg/storage/local.go

@@ -95,6 +96,11 @@ func (l *LocalStorage) WriteFile(_ context.Context, name string, data []byte) er
 	if err := os.Rename(tmpPath, filepath.Join(l.base, name)); err != nil {
 		return errors.Trace(err)


comment for WriteFile: maybe check the name does not contain path separator. Because it will cause the file to be created outside of the folder, and sync the folder inode is not enough

Perhaps we can sync the dirpath. 🤔

lance6716 · 2024-11-27T06:32:07Z

BTW I doubt what's the root cause of the test. Because unit test is run in 1 process, even if we open the same path twice for 2 FD, they still share the same underlying inode? No need to sync it to disk.

YuJuncen · 2024-11-27T07:01:23Z

BTW I doubt what's the root cause of the test. Because unit test is run in 1 process, even if we open the same path twice for 2 FD, they still share the same underlying inode? No need to sync it to disk.

In fact the main reason of the failure is that we removed the failpoint too fast, which may cause the two participants both failed to commit.

Syncing the inode is needed because not sure why, we may read steal dir content after creating a file in it. Perhaps just opening th e basedir will be enough, but as you commented, that doesn't work with subdirs.

Signed-off-by: hillium <yujuncen@pingcap.com>

lance6716 · 2024-11-27T07:48:47Z

/hold

(I'll post a long comment)

YuJuncen · 2024-11-29T09:51:30Z

# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGBUS (0x7) at pc=0x00007f436710f191, pid=14, tid=57

It seems Jenkins encounters some problems...

lance6716 · 2024-11-29T09:52:19Z

/unhold

BornChanger · 2024-12-02T00:47:58Z

/retest

tiprow · 2024-12-02T00:48:22Z

@BornChanger: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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-sigs/prow repository.

YuJuncen · 2024-12-02T06:27:59Z

/test unit-test

tiprow · 2024-12-02T06:28:21Z

@YuJuncen: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test unit-test

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-sigs/prow repository.

YuJuncen · 2024-12-02T06:28:49Z

/ok-to-test

YuJuncen · 2024-12-02T07:34:15Z

/test unit-test

tiprow · 2024-12-02T07:34:37Z

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test fast_test_tiprow_ddlargsv1
/test tidb_parser_test

Use /test all to run the following jobs that were automatically triggered:

fast_test_tiprow
tidb_parser_test

In response to this:

/test unit-test

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-sigs/prow repository.

YuJuncen · 2024-12-02T07:48:07Z

/test unit-test

tiprow · 2024-12-02T07:48:29Z

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test fast_test_tiprow_ddlargsv1
/test tidb_parser_test

Use /test all to run the following jobs that were automatically triggered:

fast_test_tiprow
tidb_parser_test

In response to this:

/test unit-test

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-sigs/prow repository.

Signed-off-by: hillium <yujuncen@pingcap.com>

YuJuncen · 2024-12-03T03:36:15Z

/retest-required

Signed-off-by: hillium <yujuncen@pingcap.com>

YuJuncen · 2024-12-03T04:46:16Z

/test unit-test

YuJuncen · 2024-12-03T04:46:24Z

/test pull-br-integration-test

ti-chi-bot · 2024-12-03T04:46:28Z

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build

/test check-dev

/test check-dev2

/test mysql-test

/test pull-br-integration-test

/test pull-integration-ddl-test

/test pull-integration-e2e-test

/test pull-lightning-integration-test

/test pull-mysql-client-test

/test pull-unit-test-ddlv1

/test unit-test

The following commands are available to trigger optional jobs:

/test pingcap/tidb/canary_ghpr_unit_test

/test pull-common-test

/test pull-e2e-test

/test pull-integration-common-test

/test pull-integration-copr-test

/test pull-integration-jdbc-test

/test pull-integration-mysql-test

/test pull-integration-nodejs-test

/test pull-integration-python-orm-test

/test pull-sqllogic-test

/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/ghpr_build

pingcap/tidb/ghpr_check

pingcap/tidb/ghpr_check2

pingcap/tidb/ghpr_mysql_test

pingcap/tidb/ghpr_unit_test

pingcap/tidb/pull_br_integration_test

pingcap/tidb/pull_integration_ddl_test

pingcap/tidb/pull_integration_e2e_test

pingcap/tidb/pull_lightning_integration_test

pingcap/tidb/pull_mysql_client_test

In response to this:

/test pull-br-integration-test

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-sigs/prow repository.

tiprow · 2024-12-03T04:46:38Z

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test fast_test_tiprow_ddlargsv1
/test tidb_parser_test

Use /test all to run the following jobs that were automatically triggered:

fast_test_tiprow
tidb_parser_test

In response to this:

/test unit-test

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-sigs/prow repository.

tiprow · 2024-12-03T04:46:45Z

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test fast_test_tiprow_ddlargsv1
/test tidb_parser_test

Use /test all to run the following jobs that were automatically triggered:

fast_test_tiprow
tidb_parser_test

In response to this:

/test pull-br-integration-test

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-sigs/prow repository.

tiprow · 2024-12-03T04:46:49Z

@ti-chi-bot[bot]: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test fast_test_tiprow
/test fast_test_tiprow_ddlargsv1
/test tidb_parser_test

Use /test all to run the following jobs that were automatically triggered:

fast_test_tiprow
tidb_parser_test

In response to this:

@YuJuncen: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:
/test build
/test check-dev
/test check-dev2
/test mysql-test
/test pull-br-integration-test
/test pull-integration-ddl-test
/test pull-integration-e2e-test
/test pull-lightning-integration-test
/test pull-mysql-client-test
/test pull-unit-test-ddlv1
/test unit-test
The following commands are available to trigger optional jobs:
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-nodejs-test
/test pull-integration-python-orm-test
/test pull-sqllogic-test
/test pull-tiflash-test
Use /test all to run the following jobs that were automatically triggered:
pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test
pingcap/tidb/pull_br_integration_test
pingcap/tidb/pull_integration_ddl_test
pingcap/tidb/pull_integration_e2e_test
pingcap/tidb/pull_lightning_integration_test
pingcap/tidb/pull_mysql_client_test
In response to this:

/test pull-br-integration-test

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-sigs/prow repository.

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-sigs/prow repository.

…efault behavior Signed-off-by: hillium <yujuncen@pingcap.com>

tiprow · 2024-12-03T05:56:49Z

@YuJuncen: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
fast_test_tiprow	`4c93260`	link	true	`/test fast_test_tiprow`

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

ti-chi-bot · 2024-12-03T06:40:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hawkingrei, lance6716, Leavrth, Tristan1900

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:

~~br/pkg/storage/OWNERS~~ [Leavrth,lance6716]

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 · 2024-12-03T06:40:11Z

[LGTM Timeline notifier]

Timeline:

2024-11-22 13:23:00.189955229 +0000 UTC m=+210767.809609744: ☑️ agreed by hawkingrei.
2024-11-27 06:11:51.659447877 +0000 UTC m=+616899.279102393: ☑️ agreed by Leavrth.
2024-11-27 07:58:55.737775611 +0000 UTC m=+623323.357430126: ✖️🔁 reset by lance6716.
2024-11-29 08:11:04.941034294 +0000 UTC m=+796852.560688810: ☑️ agreed by lance6716.
2024-12-03 06:40:10.178023771 +0000 UTC m=+1136997.797678286: ☑️ agreed by Leavrth.

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 21, 2024

Tristan1900 approved these changes Nov 21, 2024

View reviewed changes

br/pkg/storage/local.go Outdated Show resolved Hide resolved

YuJuncen closed this Nov 22, 2024

YuJuncen reopened this Nov 22, 2024

hawkingrei approved these changes Nov 22, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 22, 2024

YuJuncen added 4 commits November 27, 2024 14:10

fix flaky test TestConcurrentLock

8e8f28b

Signed-off-by: hillium <yujuncen@pingcap.com>

disable gosec

30a4c99

Signed-off-by: hillium <yujuncen@pingcap.com>

close fd when closing storage

1caabaf

Signed-off-by: hillium <yujuncen@pingcap.com>

make a better name for once

8ac1d3f

Signed-off-by: hillium <yujuncen@pingcap.com>

hawkingrei force-pushed the fix-flaky-test-concurrency-lock branch from 2758b86 to 8ac1d3f Compare November 27, 2024 06:10

Leavrth approved these changes Nov 27, 2024

View reviewed changes

ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 27, 2024

lance6716 approved these changes Nov 27, 2024

View reviewed changes

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 Nov 27, 2024

sync basedir

fbd4b56

Signed-off-by: hillium <yujuncen@pingcap.com>

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 Nov 29, 2024

ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Dec 2, 2024

fix test pkg/executor/importer/import_test.go:411 failure

214ab0a

Signed-off-by: hillium <yujuncen@pingcap.com>

make Walk don't return error when walking empty dir

c941629

Signed-off-by: hillium <yujuncen@pingcap.com>

restore local.go, use a much simpler implementation to don't change d…

4c93260

…efault behavior Signed-off-by: hillium <yujuncen@pingcap.com>

Leavrth approved these changes Dec 3, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 3, 2024

ti-chi-bot bot merged commit 5598c11 into pingcap:master Dec 3, 2024
34 of 35 checks passed

		@@ -95,6 +96,11 @@ func (l *LocalStorage) WriteFile(_ context.Context, name string, data []byte) er
		if err := os.Rename(tmpPath, filepath.Join(l.base, name)); err != nil {
		return errors.Trace(err)

br: fix flaky test TestConcurrentLock #57591

br: fix flaky test TestConcurrentLock #57591

Conversation

YuJuncen commented Nov 21, 2024 • edited by hawkingrei Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Nov 21, 2024

codecov bot commented Nov 21, 2024 • edited Loading

Codecov Report

Tristan1900 left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Nov 21, 2024

YuJuncen commented Nov 22, 2024

hawkingrei commented Nov 22, 2024

YuJuncen commented Nov 27, 2024

tiprow bot commented Nov 27, 2024

hawkingrei commented Nov 27, 2024

lance6716 left a comment

Choose a reason for hiding this comment

lance6716 Nov 27, 2024

Choose a reason for hiding this comment

YuJuncen Nov 27, 2024

Choose a reason for hiding this comment

lance6716 commented Nov 27, 2024

YuJuncen commented Nov 27, 2024

lance6716 commented Nov 27, 2024

YuJuncen commented Nov 29, 2024

lance6716 commented Nov 29, 2024

BornChanger commented Dec 2, 2024

tiprow bot commented Dec 2, 2024

YuJuncen commented Dec 2, 2024

tiprow bot commented Dec 2, 2024

YuJuncen commented Dec 2, 2024

YuJuncen commented Dec 2, 2024

tiprow bot commented Dec 2, 2024

YuJuncen commented Dec 2, 2024

tiprow bot commented Dec 2, 2024

YuJuncen commented Dec 3, 2024

YuJuncen commented Dec 3, 2024

YuJuncen commented Dec 3, 2024

ti-chi-bot bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

tiprow bot commented Dec 3, 2024

ti-chi-bot bot commented Dec 3, 2024

ti-chi-bot bot commented Dec 3, 2024

[LGTM Timeline notifier]

br: fix flaky test `TestConcurrentLock` #57591

br: fix flaky test `TestConcurrentLock` #57591

YuJuncen commented Nov 21, 2024 •

edited by hawkingrei

Loading

codecov bot commented Nov 21, 2024 •

edited

Loading