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

Added readiness probe for Router #5916

Merged
merged 2 commits into from
Nov 19, 2015

Conversation

miminar
Copy link

@miminar miminar commented Nov 16, 2015

Uses the same endpoint as liveness probe does.

Partially addresses #5900

Signed-off-by: Michal Minar [email protected]

Use the same endpoint as for liveness probes.

Signed-off-by: Michal Minar <[email protected]>
@miminar
Copy link
Author

miminar commented Nov 16, 2015

@Kargakis could you please take a look?

@0xmichalis
Copy link
Contributor

LGTM

cc: @pweil-

@pweil-
Copy link

pweil- commented Nov 16, 2015

We should use the new healthz handler to detect liveness and readiness. https://github.com/openshift/origin/blob/master/images/router/haproxy/conf/haproxy-config.template#L46-46

cc @ramr - we landed on this always being available, right?

Fall back to tcp socket action if stats port is unset.

Signed-off-by: Michal Minar <[email protected]>
@miminar
Copy link
Author

miminar commented Nov 18, 2015

@pweil- thanks for pointing that out. I've just switched to this route in both liveness and readiness probes.

@miminar
Copy link
Author

miminar commented Nov 18, 2015

cc: @smarterclayton

@smarterclayton
Copy link
Contributor

I think @ramr had to make it always available still - or Ben was going to do it?

@ramr
Copy link
Contributor

ramr commented Nov 19, 2015

@pweil- @smarterclayton yeah was going to the /healthz endpoint always available - probably get to it in the next couple of days. For now, this code looks good and will change it along with the PR for that - the if condition checking for config.StatsPort would become redundant at that point and the else part would just drop off and can be deleted.

@smarterclayton
Copy link
Contributor

Thanks, LGTM [merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 595572a

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7226/)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4055/) (Image: devenv-rhel7_2741)

@0xmichalis
Copy link
Contributor

#5937 flake

re[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 595572a

openshift-bot pushed a commit that referenced this pull request Nov 19, 2015
@openshift-bot openshift-bot merged commit 82a35ec into openshift:master Nov 19, 2015
@miminar miminar deleted the route-readiness-probe branch January 24, 2016 18:46
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.

6 participants