Avoid lock when ecs_compatibility is explicitly specified #16786
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention.
> ~~~ ruby
> def fake_sync(&block)
> puts "FAKE_SYNC:enter"
> val = yield
> puts "FAKE_SYNC:return(#{val})"
> return val
> ensure
> puts "FAKE_SYNC:ensure"
> end
>
> fake_sync do
> @ivar = begin
> puts("BE:begin")
> break :break
>
> val = :ret
> puts("BE:return(#{val})")
> val
> ensure
> puts("BE:ensure")
> end
> end
> ~~~
Note: no `FAKE_SYNC:return`:
> ~~~
> ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) }
> ╰─● ruby break-esc.rb
> FAKE_SYNC:enter
> BE:begin
> BE:ensure
> FAKE_SYNC:ensure
> [success]
> ~~~
|
💚 Build Succeeded
|
|
@logstashmachine backport 8.x |
|
@logstashmachine backport 8.17 |
github-actions bot
pushed a commit
that referenced
this pull request
Dec 19, 2024
Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention.
> ~~~ ruby
> def fake_sync(&block)
> puts "FAKE_SYNC:enter"
> val = yield
> puts "FAKE_SYNC:return(#{val})"
> return val
> ensure
> puts "FAKE_SYNC:ensure"
> end
>
> fake_sync do
> @ivar = begin
> puts("BE:begin")
> break :break
>
> val = :ret
> puts("BE:return(#{val})")
> val
> ensure
> puts("BE:ensure")
> end
> end
> ~~~
Note: no `FAKE_SYNC:return`:
> ~~~
> ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) }
> ╰─● ruby break-esc.rb
> FAKE_SYNC:enter
> BE:begin
> BE:ensure
> FAKE_SYNC:ensure
> [success]
> ~~~
(cherry picked from commit 01c8e8b)
2 tasks
github-actions bot
pushed a commit
that referenced
this pull request
Dec 19, 2024
Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention.
> ~~~ ruby
> def fake_sync(&block)
> puts "FAKE_SYNC:enter"
> val = yield
> puts "FAKE_SYNC:return(#{val})"
> return val
> ensure
> puts "FAKE_SYNC:ensure"
> end
>
> fake_sync do
> @ivar = begin
> puts("BE:begin")
> break :break
>
> val = :ret
> puts("BE:return(#{val})")
> val
> ensure
> puts("BE:ensure")
> end
> end
> ~~~
Note: no `FAKE_SYNC:return`:
> ~~~
> ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) }
> ╰─● ruby break-esc.rb
> FAKE_SYNC:enter
> BE:begin
> BE:ensure
> FAKE_SYNC:ensure
> [success]
> ~~~
(cherry picked from commit 01c8e8b)
2 tasks
|
@logstashmachine backport 8.16 |
github-actions bot
pushed a commit
that referenced
this pull request
Dec 19, 2024
Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention.
> ~~~ ruby
> def fake_sync(&block)
> puts "FAKE_SYNC:enter"
> val = yield
> puts "FAKE_SYNC:return(#{val})"
> return val
> ensure
> puts "FAKE_SYNC:ensure"
> end
>
> fake_sync do
> @ivar = begin
> puts("BE:begin")
> break :break
>
> val = :ret
> puts("BE:return(#{val})")
> val
> ensure
> puts("BE:ensure")
> end
> end
> ~~~
Note: no `FAKE_SYNC:return`:
> ~~~
> ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) }
> ╰─● ruby break-esc.rb
> FAKE_SYNC:enter
> BE:begin
> BE:ensure
> FAKE_SYNC:ensure
> [success]
> ~~~
(cherry picked from commit 01c8e8b)
2 tasks
donoghuc
pushed a commit
that referenced
this pull request
Dec 23, 2024
…16830) Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention. > ~~~ ruby > def fake_sync(&block) > puts "FAKE_SYNC:enter" > val = yield > puts "FAKE_SYNC:return(#{val})" > return val > ensure > puts "FAKE_SYNC:ensure" > end > > fake_sync do > @ivar = begin > puts("BE:begin") > break :break > > val = :ret > puts("BE:return(#{val})") > val > ensure > puts("BE:ensure") > end > end > ~~~ Note: no `FAKE_SYNC:return`: > ~~~ > ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) } > ╰─● ruby break-esc.rb > FAKE_SYNC:enter > BE:begin > BE:ensure > FAKE_SYNC:ensure > [success] > ~~~ (cherry picked from commit 01c8e8b) Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>
donoghuc
pushed a commit
that referenced
this pull request
Dec 23, 2024
…16829) Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention. > ~~~ ruby > def fake_sync(&block) > puts "FAKE_SYNC:enter" > val = yield > puts "FAKE_SYNC:return(#{val})" > return val > ensure > puts "FAKE_SYNC:ensure" > end > > fake_sync do > @ivar = begin > puts("BE:begin") > break :break > > val = :ret > puts("BE:return(#{val})") > val > ensure > puts("BE:ensure") > end > end > ~~~ Note: no `FAKE_SYNC:return`: > ~~~ > ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) } > ╰─● ruby break-esc.rb > FAKE_SYNC:enter > BE:begin > BE:ensure > FAKE_SYNC:ensure > [success] > ~~~ (cherry picked from commit 01c8e8b) Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>
donoghuc
pushed a commit
that referenced
this pull request
Dec 23, 2024
…16828) Because a `break` escapes a `begin`...`end` block, we must not use a `break` in order to ensure that the explicitly set value gets memoized to avoid lock contention. > ~~~ ruby > def fake_sync(&block) > puts "FAKE_SYNC:enter" > val = yield > puts "FAKE_SYNC:return(#{val})" > return val > ensure > puts "FAKE_SYNC:ensure" > end > > fake_sync do > @ivar = begin > puts("BE:begin") > break :break > > val = :ret > puts("BE:return(#{val})") > val > ensure > puts("BE:ensure") > end > end > ~~~ Note: no `FAKE_SYNC:return`: > ~~~ > ╭─{ rye@perhaps:~/src/elastic/logstash (main ✔) } > ╰─● ruby break-esc.rb > FAKE_SYNC:enter > BE:begin > BE:ensure > FAKE_SYNC:ensure > [success] > ~~~ (cherry picked from commit 01c8e8b) Co-authored-by: Ry Biesemeyer <yaauie@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Release notes
ecs_compatibilitydirective.What does this PR do?
Properly memoizes an explicitly-given
ecs_compatibilitydirective on first access so that it can be retrieved without lock contention.Because a
breakescapes abegin...endblock, we must not use abreakin order to ensure that the explicitly set value gets memoized to avoid lock contention.Note: no
FAKE_SYNC:return:Why is it important/What is the impact to the user?
Eliminates unnecessary lock contention, which can prevent some plugins from running as concurrently as they would otherwise be able.
Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files (and/or docker env variables)[ ] I have added tests that prove my fix is effective or that my feature worksHow to test this PR locally
Related issues
Use cases
Screenshots
Logs