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

octopus: mgr/telegraf: catch FileNotFoundError exception #34629

Merged
merged 1 commit into from
Apr 29, 2020

Conversation

shyukri
Copy link
Contributor

@shyukri shyukri commented Apr 18, 2020

backport tracker: https://tracker.ceph.com/issues/45069


backport of #34468
parent tracker: https://tracker.ceph.com/issues/43551

this backport was staged using ceph-backport.sh version 15.1.1.389
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

in tasks/module_selftest.yaml, `TestModuleSelftest.test_telegraf()` is
called. but we fail to prepare a unix domain socket to which the telegraf
module can send stats. and telegraf module does not catch
FileNotFoundError exception, so the exception is populated to ceph-mgr
and is found by the test, hence the test is marked a failure whenever
telegraf is tested.

in this change,

* catch this exception, so it won't be caught by ceph-mgr
* whitelist the error message, so the test can pass

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f6d028d)
@yuriw
Copy link
Contributor

yuriw commented Apr 22, 2020

@yuriw yuriw merged commit 9bd2bb5 into ceph:octopus Apr 29, 2020
@shyukri shyukri deleted the wip-45069-octopus branch April 29, 2020 16:45
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.

5 participants