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

Promtail: Fix deadlock on tailer shutdown. #2717

Merged
merged 12 commits into from
Oct 4, 2020
Merged

Promtail: Fix deadlock on tailer shutdown. #2717

merged 12 commits into from
Oct 4, 2020

Commits on Oct 3, 2020

  1. to avoid a deadlock on shutdown, leave the goroutine running which re… 

    …ads the Lines channel from the tailer and it will exit when the tailer closes the channel.
    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    cb3c49a View commit details
    Browse the repository at this point in the history

  2. remove the flag I added a few weeks ago and instead when updating the… 

    … position information of the file gracefully fail if the file no longer exists.
    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    a598328 View commit details
    Browse the repository at this point in the history

  3. update the vendoring of the tail library, more re-work on how tailing… 

    … shutdown and errors are handled.
    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    e6d727d View commit details
    Browse the repository at this point in the history

  4. fix mistake

    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    f0d381b View commit details
    Browse the repository at this point in the history

  5. updating tail lib to merged commit hash

    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    44fee14 View commit details
    Browse the repository at this point in the history

  6. go mod tidy

    @slim-bean
    slim-bean committed Oct 3, 2020
    Configuration menu
    Copy the full SHA
    b9e6926 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2020

  1. update tail library with additional mutex lock

    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    58ef3ef View commit details
    Browse the repository at this point in the history

  2. break up the tailer goroutine into two separate goroutines to make it… 

    … a little more clear and remove some special case logic.
    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    ee2a592 View commit details
    Browse the repository at this point in the history

  3. don't forget to close your channels!

    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    6047b71 View commit details
    Browse the repository at this point in the history

  4. make the stop method in the tailer only execute at most one time.

    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    10fe290 View commit details
    Browse the repository at this point in the history

  5. update hp-tail again with improvements to the mutex locking in closeFile

    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    8c3fccf View commit details
    Browse the repository at this point in the history

  6. replace the more complicated channel based single execution code with… 

    … a sync.Once
    @slim-bean
    slim-bean committed Oct 4, 2020
    Configuration menu
    Copy the full SHA
    f12cb11 View commit details
    Browse the repository at this point in the history