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

Fix flaky TestReload #2624

Merged
merged 1 commit into from
Nov 10, 2020

Conversation

albertteoh
Copy link
Contributor

Signed-off-by: albertteoh albert.teoh@logz.io

Which problem is this PR solving?

Short description of the changes

Fixes the flaky TestReload test by:

  • Firstly logging after the modified certificate has finished reloading, as suggested by @chlunde; and use this log entry as our signal for cert file mod completion.
  • Adds assertion on keyFile log entry, and make both assertions more specific along with diagnostic data on failure to help with debugging if the race condition presents itself again in future.

Testing

Repeated the following test 3x with no errors.:

go test -test.count=5000 -test.run=TestReload$ ./pkg/config/tlscfg/

Signed-off-by: albertteoh <albert.teoh@logz.io>
@albertteoh albertteoh requested a review from a team as a code owner November 10, 2020 11:44
@codecov
Copy link

codecov bot commented Nov 10, 2020

Codecov Report

Merging #2624 (db1263f) into master (80805d2) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2624      +/-   ##
==========================================
- Coverage   95.05%   95.04%   -0.01%     
==========================================
  Files         209      209              
  Lines        9364     9368       +4     
==========================================
+ Hits         8901     8904       +3     
  Misses        387      387              
- Partials       76       77       +1     
Impacted Files Coverage Δ
pkg/config/tlscfg/cert_watcher.go 94.80% <100.00%> (+0.28%) ⬆️
cmd/query/app/server.go 88.52% <0.00%> (-1.64%) ⬇️
plugin/storage/integration/integration.go 77.34% <0.00%> (-0.56%) ⬇️
...lugin/sampling/strategystore/adaptive/processor.go 100.00% <0.00%> (+0.92%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 80805d2...db1263f. Read the comment docs.

Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

thanks!

@yurishkuro yurishkuro merged commit 839f42e into jaegertracing:master Nov 10, 2020
@albertteoh albertteoh deleted the fix-flaky-testreload branch November 10, 2020 23:07
quinniup pushed a commit to k8battleship/jaeger that referenced this pull request Nov 23, 2020
Signed-off-by: albertteoh <albert.teoh@logz.io>
quinniup added a commit to k8battleship/jaeger that referenced this pull request Nov 23, 2020
* Bump opentelemetry-collector to v0.14.0 (jaegertracing#2617)

* bump opentelemetry-collector to v0.14.0

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* initialize traceid and spanid explicitly

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fix comments and empty parent span check

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fasten convert traceID/spanID

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* fix convertTraceID + fix tests

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* Update CodeQL to latest best practices (jaegertracing#2615)

This will parallelize your analysis and speed things up a bunch.

Signed-off-by: jhutchings1 <jhutchings1@users.noreply.github.com>

Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>

* Fix flaky TestReload (jaegertracing#2624)

Signed-off-by: albertteoh <albert.teoh@logz.io>

* Update x/text to v0.3.4 (jaegertracing#2625)

Signed-off-by: Gary Brown <gary@brownuk.com>

* Bump to latest UI for snapshot builds (jaegertracing#2626)

Signed-off-by: Yuri Shkuro <github@ysh.us>

* Implement anonymizer's main program (jaegertracing#2621)

* Preparing release 1.21.0 (jaegertracing#2630)

* updated changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Added ui changelog

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Fixed UI changelog to point to 1.12.0

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Updated jaeger-ui to v1.12.0

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Resolving concerns

Signed-off-by: Joe Elliott <number101010@gmail.com>

* [anonymizer] Save trace in UI format (jaegertracing#2629)

* Use fossa-contrib/fossa-action instead (jaegertracing#2571)

* Use fossa-contrib/fossa-action instead

Signed-off-by: Sora Morimoto <sora@morimoto.io>

* Make step name clearer

Signed-off-by: Sora Morimoto <sora@morimoto.io>

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>

* Update Makefile and Dockerfile for anonymizer (jaegertracing#2632)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix listen IP in unit test (jaegertracing#2636)

Signed-off-by: zouyu <zouy.fnst@cn.fujitsu.com>

* Bump opentelemetry to v0.15.0 (jaegertracing#2634)

* Bump opentelemetry to v0.15.0

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* add default value instead of nil value for jaegerreceiver config

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* make lint

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

Co-authored-by: Kositsyn Pavel <vemmy124@gmail.com>
Co-authored-by: Justin Hutchings <jhutchings1@users.noreply.github.com>
Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
Co-authored-by: Albert <26584478+albertteoh@users.noreply.github.com>
Co-authored-by: Gary Brown <gary.pi4tech@gmail.com>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Ashmita <ashmita.bohara152@gmail.com>
Co-authored-by: Joe Elliott <number101010@gmail.com>
Co-authored-by: Sora Morimoto <sora@morimoto.io>
Co-authored-by: ZouYu <zouy.fnst@cn.fujitsu.com>
Co-authored-by: Kositsyn Pavel <kositsyn.pa@phystech.edu>
@albertteoh albertteoh mentioned this pull request Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flaky test: TestReload
2 participants