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.

Sign up for GitHub

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

Jump to bottom

[3.4] Backport livez/readyz #17128

Merged
merged 4 commits into from
Dec 19, 2023
Merged

[3.4] Backport livez/readyz #17128

merged 4 commits into from
Dec 19, 2023

Conversation

siyuanfoundation
Copy link
Contributor

chaochn47 and others added 3 commits December 15, 2023 08:39
@chaochn47 @siyuanfoundation
http health check bug fixes
d4861d6 
Signed-off-by: Chao Chen <[email protected]>
@siyuanfoundation
etcdserver: add livez and ready http endpoints for etcd.
f4c229a 
Add two separate probes, one for liveness and one for readiness. The liveness probe would check that the local individual node is up and running, or else restart the node, while the readiness probe would check that the cluster is ready to serve traffic. This would make etcd health-check fully Kubernetes API complient.

Signed-off-by: Siyuan Zhang <[email protected]>
@siyuanfoundation
etcdserver: add metric counters for livez/readyz health checks.
c58ef8d 
Signed-off-by: Siyuan Zhang <[email protected]>
@siyuanfoundation
Copy link
Contributor Author

cc @serathius @ahrtr

@ahrtr
Copy link
Member

ahrtr commented Dec 18, 2023

Overall looks good to me.

@siyuanfoundation could you manually run each probe (/health, /livez, /readyz) based on this PR and paste the output?

@fuweid @jmhbnz could you also double check?

@siyuanfoundation
Copy link
Contributor Author

Overall looks good to me.

@siyuanfoundation could you manually run each probe (/health, /livez, /readyz) based on this PR and paste the output?

I will backport the e2e tests after merging this PR.
Here are the manual test results:

curl http://127.0.0.1:2379/health
> {"health":"true"}
curl http://127.0.0.1:2379/livez
> ok
curl http://127.0.0.1:2379/readyz
> ok
curl http://127.0.0.1:2379/livez?verbose=true
> [+]serializable_read ok
> ok
curl http://127.0.0.1:2379/readyz?verbose=true
> [+]serializable_read ok
> [+]linearizable_read ok
> [+]data_corruption ok
> ok

ahrtr
ahrtr approved these changes Dec 18, 2023
View reviewed changes
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

lgtm

Thanks

fuweid
fuweid approved these changes Dec 19, 2023
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@ahrtr
Copy link
Member

ahrtr commented Dec 19, 2023

@siyuanfoundation Please don't forget to update changelog for both 3.4 and 3.5.

@ahrtr ahrtr merged commit 2a07f80 into etcd-io:release-3.4 Dec 19, 2023
12 checks passed
@siyuanfoundation siyuanfoundation deleted the livez-bp-3.4-step2 branch December 21, 2023 00:14
@ahrtr ahrtr mentioned this pull request Jan 8, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahrtr ahrtr ahrtr approved these changes

@fuweid fuweid fuweid approved these changes

@serathius serathius serathius approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@siyuanfoundation @ahrtr @serathius @fuweid @chaochn47