[3.4] Backport healthcheck code cleanup #17120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Siyuan Zhang <[email protected]>
Signed-off-by: Siyuan Zhang <[email protected]>
Signed-off-by: Siyuan Zhang <[email protected]>
siyuanfoundation
changed the title
serathius
reviewed
Dec 14, 2023
tests/e2e/metrics_test.go
Outdated
| @@ -50,7 +50,7 @@ func metricsTest(cx ctlCtx) { | |||
| {"/metrics", fmt.Sprintf(`etcd_server_version{server_version="%s"} 1`, version.Version)}, | |||
| {"/metrics", fmt.Sprintf(`etcd_cluster_version{cluster_version="%s"} 1`, version.Cluster(version.Version))}, | |||
| {"/metrics", fmt.Sprintf(`grpc_server_handled_total{grpc_code="Canceled",grpc_method="Watch",grpc_service="etcdserverpb.Watch",grpc_type="bidi_stream"} 6`)}, | |||
| {"/health", `{"health":"true"}`}, | |||
| {"/health", `{"health":"true","reason":""}`}, | |||
There was a problem hiding this comment.
Looks like you unintentionally backported a "reason" field. It's not a breaking change but also not a "code cleanup".
There was a problem hiding this comment.
changed it to json:"-". Would that work?
Signed-off-by: Siyuan Zhang <[email protected]>
Signed-off-by: Siyuan Zhang <[email protected]>
Signed-off-by: Siyuan Zhang <[email protected]>
siyuanfoundation
force-pushed
the
livez-bp-3.4
branch
from
09cc82d to
4a8381a
Compare
|
CC @serathius @ahrtr |
serathius
approved these changes
Dec 14, 2023
jmhbnz
approved these changes
Dec 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.
The same as #17000.
Cherry-picked necessary changes from #13655 to prepare for the livez/healthz backport.