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(healthchecks) fix active healthchecks in stream module #4616

Merged
merged 4 commits into from
May 16, 2019

Conversation

hishamhm
Copy link
Contributor

Instead of disabling active healthchecks in the stream module altogether (which was done to avoid duplicate active healthchecks), what we need to do is to run the "tcp" type healthchecks in the stream module, and the other ones ("http", "https") in the http module.

For active healthchecks on stream to work, we need to bump lua-resty-healthcheck.

This PR also adds a test for active healthchecks using stream, which also serves like a regression test for Kong/lua-resty-healthcheck#19

@hishamhm hishamhm force-pushed the fix/healthchecks-active-stream branch 2 times, most recently from 7845a69 to a6ff1bf Compare May 15, 2019 21:23
@Tieske
Copy link
Member

Tieske commented May 16, 2019

nice follow up! didn't know this was disabled. 👍

hishamhm added 4 commits May 16, 2019 15:22
Adds a utility function that allows killing a thread
created with helpers.tcp_server early, by sending a special message.
Instead of disabling active healthchecks in the stream module
altogether (which was done to avoid duplicate active healthchecks),
what we need to do is to run the "tcp" type healthchecks in the
stream module, and the other ones ("http", "https") in the http
module.
This serves as a regression test for the problem in
Kong/lua-resty-healthcheck#19

The new tests are marked as #flaky because they are timing-dependent,
so we we will not run them regularly in CI.
* fixes TCP success reporting in active healthchecks for the
  stream module.
@hishamhm hishamhm force-pushed the fix/healthchecks-active-stream branch from a6ff1bf to ba13112 Compare May 16, 2019 18:23
@hishamhm hishamhm merged commit 3e39b56 into next May 16, 2019
@hishamhm hishamhm deleted the fix/healthchecks-active-stream branch May 16, 2019 18:23
@hishamhm hishamhm added this to the 1.2.0 milestone May 24, 2019
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.

3 participants