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: Remove noisy error message when cleaning up filesystem watches which are already removed. #8086

Merged
merged 2 commits into from Jan 11, 2023

Conversation

slim-bean
Copy link
Collaborator

@slim-bean slim-bean commented Jan 10, 2023

What this PR does / why we need it:

Promtail will emit an error message when trying to remove filesystem watches which do not exist, this PR squelches those error messages thanks to some updates in the underlying fsnotify lib which allow checking for this exact error.

Which issue(s) this PR fixes:
Fixes #3874

Special notes for your reviewer:

Checklist

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

@slim-bean slim-bean requested a review from a team as a code owner January 10, 2023 16:50
@slim-bean
Copy link
Collaborator Author

Thanks to @MidasLamb for creating fsnotify/fsnotify#455 which lead to @arp242 creating fsnotify/fsnotify#460 improving this upstream and making this possible!!! Thanks y'all!

… removing non-existent watches

Signed-off-by: Edward Welch <edward.welch@grafana.com>
Signed-off-by: Edward Welch <edward.welch@grafana.com>
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Copy link
Collaborator

@kavirajk kavirajk 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 f8e582a into main Jan 11, 2023
@slim-bean slim-bean deleted the update-fsnotify branch January 11, 2023 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Promtail errors when trying to remove non-existent inotify watch
3 participants