Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: sync access to countRun counter in TestRunnerFactory #42097

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

kruskall
Copy link
Member

Proposed commit message

countRun is incremented and checked in different goroutines

to avoid race conditions, only mark the workgroup as done after incrementing the counter

==================
WARNING: DATA RACE
Read at 0x00c000358fc8 by goroutine 10:
  github.com/elastic/beats/v7/filebeat/input/v2/compat.TestRunnerFactory_CheckConfig.func2()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat_test.go:127 +0xa31
  testing.tRunner()
      testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      testing/testing.go:1743 +0x44

Previous write at 0x00c000358fc8 by goroutine 14:
  github.com/elastic/beats/v7/filebeat/input/v2/compat.TestRunnerFactory_CheckConfig.func2.1.2()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat_test.go:89 +0x4f
  github.com/elastic/beats/v7/filebeat/input/v2/internal/inputest.(*MockInput).Run()
      github.com/elastic/beats/v7/filebeat/input/v2/internal/inputest/inputest.go:80 +0x124
  github.com/elastic/beats/v7/filebeat/input/v2/compat.(*runner).Start.func1()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go:136 +0x3c7

Goroutine 10 (running) created at:
  testing.(*T).Run()
      testing/testing.go:1743 +0x825
  github.com/elastic/beats/v7/filebeat/input/v2/compat.TestRunnerFactory_CheckConfig()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat_test.go:67 +0x56
  testing.tRunner()
      testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      testing/testing.go:1743 +0x44

Goroutine 14 (finished) created at:
  github.com/elastic/beats/v7/filebeat/input/v2/compat.(*runner).Start()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go:133 +0x16f
  github.com/elastic/beats/v7/filebeat/input/v2/compat.TestRunnerFactory_CheckConfig.func2()
      github.com/elastic/beats/v7/filebeat/input/v2/compat/compat_test.go:116 +0x7a9
  testing.tRunner()
      testing/testing.go:1690 +0x226
  testing.(*T).Run.gowrap1()
      testing/testing.go:1743 +0x44
==================
--- FAIL: TestRunnerFactory_CheckConfig (0.00s)
    --- FAIL: TestRunnerFactory_CheckConfig/does_not_cause_input_ID_duplication (0.00s)
        testing.go:1399: race detected during execution of test

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

countRun is incremented and checked in different goroutines

to avoid race conditions, only mark the workgroup as done after
incrementing the counter
@kruskall kruskall requested a review from a team as a code owner December 17, 2024 21:45
@kruskall kruskall requested review from belimawr and rdner December 17, 2024 21:46
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 17, 2024
@botelastic
Copy link

botelastic bot commented Dec 17, 2024

This pull request doesn't have a Team:<team> label.

Copy link
Contributor

mergify bot commented Dec 17, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @kruskall? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Dec 17, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 17, 2024
@kruskall kruskall merged commit 7411cc4 into elastic:main Dec 19, 2024
30 checks passed
@kruskall kruskall deleted the test/fix-testrunnerfactory-race branch December 19, 2024 22:07
mergify bot pushed a commit that referenced this pull request Dec 19, 2024
countRun is incremented and checked in different goroutines

to avoid race conditions, only mark the workgroup as done after
incrementing the counter

(cherry picked from commit 7411cc4)
kruskall added a commit that referenced this pull request Dec 19, 2024
…42129)

countRun is incremented and checked in different goroutines

to avoid race conditions, only mark the workgroup as done after
incrementing the counter

(cherry picked from commit 7411cc4)

Co-authored-by: kruskall <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify enhancement needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants