Skip to content

daemon: Fix waiting on metrics in endpoint_test.go#11966

Merged
jrajahalme merged 1 commit intocilium:masterfrom
christarazi:pr/christarazi/fix-metrics-test-flake
Jun 8, 2020
Merged

daemon: Fix waiting on metrics in endpoint_test.go#11966
jrajahalme merged 1 commit intocilium:masterfrom
christarazi:pr/christarazi/fix-metrics-test-flake

Conversation

@christarazi
Copy link
Copy Markdown
Member

@christarazi christarazi commented Jun 8, 2020

This commit fixes a flake where the metrics do not update as quickly as
we expect. It is fixed by waiting for up to 10 seconds to retrieve the
metric value we expect.

Fixes: #11955

Fix flaky assertion on metrics

@christarazi
daemon: Fix waiting on metrics in endpoint_test.go
b585a2a 
This commit fixes a flake where the metrics do not update as quickly as
we expect. It is fixed by waiting for up to 10 seconds to retrieve the
metric value we expect.

Fixes: 4a4a59b ("daemon: Add assertions for endpoint state metrics")

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team June 8, 2020 16:58
@christarazi christarazi added area/daemon Impacts operation of the Cilium daemon. area/metrics Impacts statistics / metrics gathering, eg via Prometheus. kind/bug/CI This is a bug in the testing code. release-note/ci This PR makes changes to the CI. labels Jun 8, 2020
@maintainer-s-little-helper
Copy link
Copy Markdown

maintainer-s-little-helper Bot commented Jun 8, 2020

Please set the appropriate release note label.

@christarazi christarazi requested a review from aanm June 8, 2020 16:59
@christarazi christarazi force-pushed the pr/christarazi/fix-metrics-test-flake branch from 7cfff73 to b585a2a Compare June 8, 2020 17:00
@christarazi
Copy link
Copy Markdown
Member Author

christarazi commented Jun 8, 2020

test-me-please

@christarazi
Copy link
Copy Markdown
Member Author

christarazi commented Jun 8, 2020

Note to backporters, the 1.7 backport of this PR depends on #11906 first.

@coveralls
Copy link
Copy Markdown

coveralls commented Jun 8, 2020

Coverage Status

Coverage increased (+0.007%) to 37.009% when pulling b585a2a on christarazi:pr/christarazi/fix-metrics-test-flake into a7cddb0 on cilium:master.

@maintainer-s-little-helper maintainer-s-little-helper Bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 8, 2020
@jrajahalme jrajahalme merged commit 19030a7 into cilium:master Jun 8, 2020
@christarazi christarazi deleted the pr/christarazi/fix-metrics-test-flake branch June 8, 2020 22:04
@joestringer joestringer mentioned this pull request Jun 8, 2020
Merged
@aanm aanm mentioned this pull request Jun 9, 2020
Merged
@joestringer joestringer mentioned this pull request Jun 11, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aanm aanm aanm approved these changes

Assignees

No one assigned

Labels

area/daemon Impacts operation of the Cilium daemon. area/metrics Impacts statistics / metrics gathering, eg via Prometheus. kind/bug/CI This is a bug in the testing code. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/ci This PR makes changes to the CI.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CI: TestEndpointAddNoLabels: metrics assertion failed

5 participants

@christarazi @coveralls @aanm @joestringer @jrajahalme