Cherry-pick #21930 to 7.x: [libbeat] Fix potential deadlock in the disk queue + add more unit tests #21942

faec · 2020-10-16T22:03:50Z

Cherry-pick of PR #21930 to 7.x branch. Original message:

What does this PR do?

Fix a potential reader deadlock @fearful-symmetry found during testing, and add unit tests for all of the adjacent logic.

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.~~

…sts (elastic#21930) (cherry picked from commit f2a1ba3)

elasticmachine · 2020-10-16T22:03:53Z

Pinging @elastic/integrations (Team:Integrations)

elasticmachine · 2020-10-17T01:08:05Z

❕ Build Aborted

Either there was a build timeout or someone aborted the build.'}

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: [Pull request #21942 opened]
Start Time: 2020-10-16T22:04:39.094+0000
Duration: 183 min 10 sec

Test stats 🧪

Test	Results
Failed	0
Passed	16039
Skipped	1359
Total	17398

Log output

Expand to view the last 100 lines of log output

[2020-10-16T23:40:29.661Z]   Version:          0.18.0
[2020-10-16T23:40:29.661Z]   GitCommit:        fec3683
[2020-10-17T01:06:48.024Z] Cancelling nested steps due to timeout
[2020-10-17T01:06:48.065Z] Failed in branch heartbeat-windows-windows-2019
[2020-10-17T01:06:58.118Z] [INFO] unstashV2: JOB_GCS_BUCKET is set. bucket param got precedency instead.
[2020-10-17T01:06:58.141Z] [INFO] unstashV2: JOB_GCS_CREDENTIALS is set. credentialsId param got precedency instead.
[2020-10-17T01:06:58.220Z] [Google Cloud Storage Plugin] Found 1 files to download from pattern: gs://beats-ci-temp/Beats/beats/PR-21942-1/source/source.tgz
[2020-10-17T01:06:58.237Z] [Google Cloud Storage Plugin] Downloading: Beats/beats/PR-21942-1/source/source.tgz to local path: /var/lib/jenkins/workspace/Beats_beats_PR-21942/source.tgz
[2020-10-17T01:07:07.453Z] + tar --version
[2020-10-17T01:07:07.769Z] + tar -xpf source.tgz
[2020-10-17T01:07:20.350Z] + rm source.tgz
[2020-10-17T01:07:20.490Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats
[2020-10-17T01:07:20.522Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/lint-1602887422620
[2020-10-17T01:07:20.618Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/libbeat-stress-tests-1602887704855
[2020-10-17T01:07:20.719Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/winlogbeat-crosscompile-1602887770749
[2020-10-17T01:07:20.814Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/auditbeat-crosscompile-1602887809729
[2020-10-17T01:07:20.912Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-dockerlogbeat-build-1602887841286
[2020-10-17T01:07:21.010Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-elastic-agent-build-1602887874361
[2020-10-17T01:07:21.105Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/journalbeat-unitTest-1602887890195
[2020-10-17T01:07:21.204Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/libbeat-crosscompile-1602887954515
[2020-10-17T01:07:21.302Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-functionbeat-build-1602887974086
[2020-10-17T01:07:21.395Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/packetbeat-build-1602888075892
[2020-10-17T01:07:21.493Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-unitTest-1602888220983
[2020-10-17T01:07:21.589Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/heartbeat-build-1602888242867
[2020-10-17T01:07:21.686Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-elastic-agent-windows-windows-2019-1602888267915
[2020-10-17T01:07:21.784Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/auditbeat-build-1602888277373
[2020-10-17T01:07:21.883Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/auditbeat-windows-windows-2019-1602888329647
[2020-10-17T01:07:21.979Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-crosscompile-1602888352421
[2020-10-17T01:07:22.075Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/generator-metricbeat-test-1602888386161
[2020-10-17T01:07:22.169Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/generator-beat-test-1602888397919
[2020-10-17T01:07:22.266Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-auditbeat-windows-windows-2019-1602888457410
[2020-10-17T01:07:22.362Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-functionbeat-windows-windows-2019-1602888493774
[2020-10-17T01:07:22.459Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/filebeat-windows-windows-2019-1602888507906
[2020-10-17T01:07:22.553Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-auditbeat-build-1602888517501
[2020-10-17T01:07:22.647Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/winlogbeat-windows-windows-2019-1602888519558
[2020-10-17T01:07:22.746Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-winlogbeat-build-windows-2019-1602888521875
[2020-10-17T01:07:22.844Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/packetbeat-windows-windows-2019-1602888580550
[2020-10-17T01:07:22.943Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-filebeat-windows-windows-2019-1602888618462
[2020-10-17T01:07:23.040Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-libbeat-build-1602888635621
[2020-10-17T01:07:23.134Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-windows-windows-2019-1602888733718
[2020-10-17T01:07:23.227Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-windows-windows-2019-1602888816379
[2020-10-17T01:07:23.322Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/filebeat-build-1602889239607
[2020-10-17T01:07:23.418Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/libbeat-build-1602889482202
[2020-10-17T01:07:23.515Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-goIntegTest-1602889684017
[2020-10-17T01:07:23.613Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-pythonIntegTest-1602889703371
[2020-10-17T01:07:23.708Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-filebeat-build-1602890146351
[2020-10-17T01:07:23.803Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554
[2020-10-17T01:07:24.229Z] + cat
[2020-10-17T01:07:24.229Z] + /usr/local/bin/runbld ./runbld-test-reports --job-name elastic+beats+pull-request
[2020-10-17T01:07:24.229Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-10-17T01:07:34.483Z] runbld>>> runbld started
[2020-10-17T01:07:34.483Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-10-17T01:07:35.867Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-10-17T01:07:35.867Z] runbld>>> Matches in the system config:
[2020-10-17T01:07:35.867Z] runbld>>> - Matched ^elastic\+beats
[2020-10-17T01:07:35.867Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-10-17T01:07:37.250Z] runbld>>> Debug logging enabled.
[2020-10-17T01:07:37.250Z] runbld>>> Storing result
[2020-10-17T01:07:37.250Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-10-17T01:07:37.250Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20201017010736-425E3D00
[2020-10-17T01:07:37.250Z] runbld>>> Adding system facts.
[2020-10-17T01:07:38.637Z] runbld>>> Adding vcs info for the latest commit:  37ecffd542181111dbd148068f79a80a6cf9ab0a
[2020-10-17T01:07:38.637Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-10-17T01:07:38.898Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-10-17T01:07:38.898Z] Processing JUnit reports with runbld...
[2020-10-17T01:07:38.898Z] + echo 'Processing JUnit reports with runbld...'
[2020-10-17T01:07:39.471Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-10-17T01:07:39.471Z] runbld>>> DURATION: 32ms
[2020-10-17T01:07:39.471Z] runbld>>> STDOUT: 40 bytes
[2020-10-17T01:07:39.471Z] runbld>>> STDERR: 49 bytes
[2020-10-17T01:07:39.471Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-10-17T01:07:39.471Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-21942
[2020-10-17T01:07:40.411Z] runbld>>> Storing build metadata: 
[2020-10-17T01:07:40.411Z] runbld>>> Adding test report.
[2020-10-17T01:07:40.411Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats
[2020-10-17T01:07:41.355Z] runbld>>> Found 121 test output files
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/x-pack-metricbeat-build-1602891221554/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-goIntegTest-1602889684017/metricbeat/build/TEST-go-integration-windows.xml
[2020-10-17T01:07:43.908Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-21942/src/github.com/elastic/beats/metricbeat-goIntegTest-1602889684017/metricbeat/build/TEST-go-integration-graphite.xml
[2020-10-17T01:07:45.306Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 17398 Skipped: 1079
[2020-10-17T01:07:45.306Z] runbld>>> Storing result
[2020-10-17T01:07:45.306Z] runbld>>> FAILURES: 0
[2020-10-17T01:07:45.566Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-10-17T01:07:45.566Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20201017010736-425E3D00
[2020-10-17T01:07:45.826Z] runbld>>> Email notification disabled by environment variable.
[2020-10-17T01:07:45.826Z] runbld>>> Slack notification disabled by environment variable.
[2020-10-17T01:07:48.026Z] Body did not finish within grace period; terminating with extreme prejudice
[2020-10-17T01:07:48.043Z] ERROR: runbld post build action failed.
[2020-10-17T01:07:48.043Z] Timeout has been exceeded
[2020-10-17T01:07:48.517Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-21942
[2020-10-17T01:07:48.629Z] [INFO] getVaultSecret: Getting secrets
[2020-10-17T01:07:48.700Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-10-17T01:07:49.589Z] + chmod 755 generate-build-data.sh
[2020-10-17T01:07:49.589Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21942/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21942/runs/1 ABORTED 10990222
[2020-10-17T01:07:49.589Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21942/runs/1/steps/?limit=10000 -o steps-info.json
[2020-10-17T01:07:52.072Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-21942/runs/1/tests/?status=FAILED -o tests-errors.json

[libbeat] Fix potential deadlock in the disk queue + add more unit te…

37ecffd

…sts (elastic#21930) (cherry picked from commit f2a1ba3)

faec added [zube]: In Review backport Team:Integrations Label for the Integrations team labels Oct 16, 2020

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 Oct 16, 2020

faec requested a review from fearful-symmetry October 16, 2020 22:04

ChrsMark approved these changes Oct 19, 2020

View reviewed changes

faec merged commit f37edd6 into elastic:7.x Oct 19, 2020

zube bot added [zube]: Done and removed [zube]: In Review labels Oct 19, 2020

zube bot removed the [zube]: Done label Jan 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Cherry-pick #21930 to 7.x: [libbeat] Fix potential deadlock in the disk queue + add more unit tests #21942

Cherry-pick #21930 to 7.x: [libbeat] Fix potential deadlock in the disk queue + add more unit tests #21942

Uh oh!

faec commented Oct 16, 2020 •

edited by zube bot

Loading

Uh oh!

elasticmachine commented Oct 16, 2020

Uh oh!

elasticmachine commented Oct 17, 2020

Build stats

Test stats 🧪

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Cherry-pick #21930 to 7.x: [libbeat] Fix potential deadlock in the disk queue + add more unit tests #21942

Cherry-pick #21930 to 7.x: [libbeat] Fix potential deadlock in the disk queue + add more unit tests #21942

Uh oh!

Conversation

faec commented Oct 16, 2020 • edited by zube bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Checklist

Uh oh!

elasticmachine commented Oct 16, 2020

Uh oh!

elasticmachine commented Oct 17, 2020

❕ Build Aborted

Build stats

Test stats 🧪

Log output

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

faec commented Oct 16, 2020 •

edited by zube bot

Loading