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: Break on iterate journal failure #9155

Merged
merged 2 commits into from
May 4, 2023

Conversation

farodin91
Copy link
Contributor

@farodin91 farodin91 commented Apr 17, 2023

What this PR does / why we need it:

{"caller":"journaltarget.go:214","err":"failed to iterate journal: bad message","level":"error","msg":"received unexpected error while following the journal","ts":"2023-04-17T12:24:26.803335195Z"}
{"caller":"journaltarget.go:214","err":"failed to iterate journal: bad message","level":"error","msg":"received unexpected error while following the journal","ts":"2023-04-17T12:24:26.903980219Z"}
{"caller":"journaltarget.go:214","err":"failed to iterate journal: bad message","level":"error","msg":"received unexpected error while following the journal","ts":"2023-04-17T12:24:27.0042025Z"}

https://github.com/coreos/go-systemd/blob/main/sdjournal/journal.go#L583 origin

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@farodin91 farodin91 requested a review from a team as a code owner April 17, 2023 11:19
@farodin91
Copy link
Contributor Author

@dannykopping Would you like to review? I have no idea why drone is failing

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

Thank you! Can you please add a test?

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

@farodin91 on second thought, we don't need a test here. Thank you

@dannykopping dannykopping merged commit c4048a3 into grafana:main May 4, 2023
@farodin91
Copy link
Contributor Author

@dannykopping Will this be backported?

aminesnow pushed a commit to aminesnow/loki that referenced this pull request May 4, 2023
@dannykopping
Copy link
Contributor

Sure 👍

@dannykopping dannykopping added backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch type/bug Somehing is not working as expected labels May 4, 2023
@grafanabot

This comment was marked as off-topic.

@dannykopping dannykopping added backport release-2.8.x and removed backport-failed backport release-2.6.x Tag a PR with this label to create a PR which cherry pics it into the release-2.6.x branch labels May 4, 2023
@grafanabot
Copy link
Collaborator

The backport to release-2.8.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9155-to-release-2.8.x origin/release-2.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x c4048a3adffc4b13957d0b3f41381277b391c56f
# Push it to GitHub
git push --set-upstream origin backport-9155-to-release-2.8.x
git switch main
# Remove the local backport branch
git branch -D backport-9155-to-release-2.8.x

Then, create a pull request where the base branch is release-2.8.x and the compare/head branch is backport-9155-to-release-2.8.x.

dannykopping pushed a commit that referenced this pull request May 5, 2023
dannykopping pushed a commit that referenced this pull request May 5, 2023
(cherry picked from commit c4048a3 /
#9155)

Co-authored-by: Jan Jansen <farodin91@users.noreply.github.com>
@dannykopping
Copy link
Contributor

@farodin91 done: #9403

@farodin91 farodin91 deleted the failed-to-iterate-journal branch July 21, 2023 14:12
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.

3 participants