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.

Sign up for GitHub

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

Jump to bottom

[Heartbeat] Fix race condition in scheduler tests #35728

Merged
merged 2 commits into from
Jun 14, 2023
Merged

[Heartbeat] Fix race condition in scheduler tests #35728

merged 2 commits into from
Jun 14, 2023

Conversation

emilioalvap
Copy link
Collaborator

What does this PR do?

Closes #35464.
Closes #35627.

Fixes race condition on scheduler unit tests.

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.

@emilioalvap emilioalvap added bug Team:obs-ds-hosted-services Label for the Observability Hosted Services team release-note:skip The PR should be ignored when processing the changelog failed-test indicates a failed automation test relates labels Jun 9, 2023
@emilioalvap emilioalvap requested a review from a team as a code owner June 9, 2023 10:20
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jun 9, 2023
@mergify
Copy link
Contributor

mergify bot commented Jun 9, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @emilioalvap? 🙏.
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-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@emilioalvap emilioalvap added the backport-v8.8.0 Automated backport with mergify label Jun 9, 2023
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 9, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-09T10:21:55.235+0000

  • Duration: 49 min 19 sec

Test stats 🧪

Test Results
Failed 0
Passed 1909
Skipped 25
Total 1934

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@emilioalvap emilioalvap enabled auto-merge (squash) June 9, 2023 11:21
vigneshshanmugam
vigneshshanmugam reviewed Jun 9, 2023
View reviewed changes
heartbeat/scheduler/scheduler_test.go
@@ -231,15 +231,15 @@ func TestSchedTaskLimits(t *testing.T) {
numJobs: 50,
limit: math.MaxInt64,
expect: func(events []int) {
require.GreaterOrEqual(t, len(events), 50)
require.GreaterOrEqual(t, len(events), 250)
Copy link
Member

Choose a reason for hiding this comment

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

Feels wrong, Even though the limit is maxed out, any reason why we are going far of the configured number of jobs? Probably I am missing something here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Each task is generating 4 additional continuations, which it didn't originally account for

beats/heartbeat/scheduler/scheduler_test.go

Line 261 in c4398dc

tf := makeTasks(4, func() {
.

@emilioalvap emilioalvap merged commit 0866673 into elastic:main Jun 14, 2023
mergify bot pushed a commit that referenced this pull request Jun 14, 2023
@emilioalvap @mergify
[Heartbeat] Fix race condition in scheduler tests (#35728)
8fc5bcb 
(cherry picked from commit 0866673)
@mergify mergify bot mentioned this pull request Jun 14, 2023
Merged
emilioalvap added a commit that referenced this pull request Jun 15, 2023
@mergify @emilioalvap
[Heartbeat] Fix race condition in scheduler tests (#35728) (#35769)
67559c1 
(cherry picked from commit 0866673)

Co-authored-by: Emilio Alvarez Piñeiro <[email protected]>
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vigneshshanmugam vigneshshanmugam vigneshshanmugam approved these changes

@andrewvc andrewvc Awaiting requested review from andrewvc

Assignees

@emilioalvap emilioalvap

Labels
backport-v8.8.0 Automated backport with mergify bug failed-test indicates a failed automation test relates release-note:skip The PR should be ignored when processing the changelog Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Milestone
No milestone
3 participants
@emilioalvap @elasticmachine @vigneshshanmugam