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

Promtail: Fix concurrent map iteration when using stdin #2570

Merged
merged 1 commit into from
Sep 1, 2020

Conversation

slim-bean
Copy link
Collaborator

Fixes #2569

@codecov-commenter
Copy link

Codecov Report

Merging #2570 into master will increase coverage by 0.05%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2570      +/-   ##
==========================================
+ Coverage   62.85%   62.91%   +0.05%     
==========================================
  Files         169      169              
  Lines       14913    14913              
==========================================
+ Hits         9374     9382       +8     
+ Misses       4790     4786       -4     
+ Partials      749      745       -4     
Impacted Files Coverage Δ
pkg/promtail/targets/stdin/stdin_target_manager.go 73.33% <0.00%> (ø)
pkg/logql/evaluator.go 92.88% <0.00%> (+0.40%) ⬆️
pkg/promtail/targets/file/tailer.go 72.91% <0.00%> (+2.08%) ⬆️
pkg/promtail/targets/file/filetarget.go 69.14% <0.00%> (+2.28%) ⬆️

Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

lgtm

@slim-bean slim-bean merged commit b8b24f3 into master Sep 1, 2020
@slim-bean slim-bean deleted the clone-lables-stdin branch September 1, 2020 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fatal error: concurrent map iteration and map write
3 participants