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

Backport PR #16786 to 8.17: Avoid lock when ecs_compatibility is explicitly specified #16829

Open
wants to merge 1 commit into
base: 8.17
Choose a base branch
from
Open

Backport PR #16786 to 8.17: Avoid lock when ecs_compatibility is explicitly specified #16829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions logstash-core/lib/logstash/plugins/ecs_compatibility_support.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ def self.included(base)

def ecs_compatibility
@_ecs_compatibility || LogStash::Util.synchronize(self) do
@_ecs_compatibility ||= begin
# use config_init-set value if present
break @ecs_compatibility unless @ecs_compatibility.nil?
# use config_init-set value if present
@_ecs_compatibility ||= @ecs_compatibility

# load default from settings
@_ecs_compatibility ||= begin
pipeline = execution_context.pipeline
pipeline_settings = pipeline && pipeline.settings
pipeline_settings ||= LogStash::SETTINGS
Expand Down