[3.4] Backport e2e tests for livez/readyz. #17144
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
siyuanfoundation
force-pushed
the
livez-bp-3.4-e2e
branch
6 times, most recently
from
379f192 to
f4fd1ef
Compare
fuweid
reviewed
Dec 20, 2023
fuweid
reviewed
Dec 20, 2023
siyuanfoundation
force-pushed
the
livez-bp-3.4-e2e
branch
from
f4fd1ef to
d380e46
Compare
serathius
reviewed
Dec 21, 2023
tests/e2e/etcd_process.go
Outdated
| @@ -105,6 +125,15 @@ func (ep *etcdServerProcess) Start() error { | |||
| if ep.proc != nil { | |||
| panic("already started") | |||
| } | |||
| if ep.cfg.proxy != nil && ep.proxy == nil { | |||
| // ep.cfg.lg.Info("starting proxy...", zap.String("name", ep.cfg.name), zap.String("from", ep.cfg.proxy.From.String()), zap.String("to", ep.cfg.proxy.To.String())) | |||
There was a problem hiding this comment.
Any reason to leave this here? Any problems with uncommenting this?
There was a problem hiding this comment.
there is no log in 3.4 implementation of etcd process. Removed the line.
serathius
approved these changes
Dec 21, 2023
|
/retest |
ahrtr
reviewed
Dec 21, 2023
go.mod
Outdated
| golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 | ||
| google.golang.org/grpc v1.58.3 | ||
| google.golang.org/grpc v1.59.0 |
There was a problem hiding this comment.
Usually we don't proactively bump dependency in a stable release unless there is any CVE or critical/major issue. Also we should do it in a separate PR if we decided to do it.
But I won't insist on it this time if there is no any objection from other maintainers and grpc-go expert/maintainer. @dfawley
Also interesting .... I see that the grpc-go's tag v1.59.0 was created on Oct 17, 2023, but I do not see grpc-go team explicitly releases it, as I do not see the release in https://github.com/grpc/grpc-go/releases @dfawley is there any reason that you intentionally did not release grpc-go v1.59.0?
There was a problem hiding this comment.
Removed the change since it is not necessary for this PR.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
Signed-off-by: Siyuan Zhang <sizhang@google.com>
siyuanfoundation
force-pushed
the
livez-bp-3.4-e2e
branch
from
d380e46 to
5ca4d8c
Compare
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Jan 23, 2024
Assume etcd-io#16916 as baseline. The E2E takes `1395.082s`. * etcd-io#16988 It introduced `TestAuthority` which takes `18.39s`. And after etcd-io#16997, it takes `50.05s`. * etcd-io#16995 It introduced `TestInPlaceRecovery` which takes `17.37s`. * etcd-io#17144 - New `TestHTTPHealthHandler` takes `29.9s` - New `TestHTTPLivezReadyzHandler` takes `35.20s` * etcd-io#17173 - New `TestMemberReplace` takes `7.55s`. Ideally, it should increase `140.07s`. It's not larger than `1800s` timeout value. However, we run E2E cases 3 times. By default, we run E2E cases with `-cpu 1,2,4`. That means that we run 3 times. ```bash $ go help testflag -count n Run each test, benchmark, and fuzz seed n times (default 1). If -cpu is set, run n times for each GOMAXPROCS value. Examples are always run once. -count does not apply to fuzz tests matched by -fuzz. ``` I don't think we should run E2E with different GOMAXPROCS value. All the `TestXYZ` are used to control etcd process and we don't set GOMAXPROCS env to etcd process. So, we don't need `-cpu` setting for E2E. Closes: etcd-io#17241 Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Jan 23, 2024
Assume etcd-io#16916 as baseline. The E2E takes `1395.082s`. * etcd-io#16988 It introduced `TestAuthority` which takes `18.39s`. And after etcd-io#16997, it takes `50.05s`. * etcd-io#16995 It introduced `TestInPlaceRecovery` which takes `17.37s`. * etcd-io#17144 - New `TestHTTPHealthHandler` takes `29.9s` - New `TestHTTPLivezReadyzHandler` takes `35.20s` * etcd-io#17173 - New `TestMemberReplace` takes `7.55s`. Ideally, it should increase `140.07s`. It's not larger than `1800s` timeout value. However, we run E2E cases 3 times. By default, we run E2E cases with `-cpu 1,2,4`. That means that we run 3 times. `1395.082s` + `140.07s * 3` = `1815.292s` > `1800s` ```bash $ go help testflag -count n Run each test, benchmark, and fuzz seed n times (default 1). If -cpu is set, run n times for each GOMAXPROCS value. Examples are always run once. -count does not apply to fuzz tests matched by -fuzz. ``` I don't think we should run E2E with different GOMAXPROCS value. All the `TestXYZ` are used to control etcd process and we don't set GOMAXPROCS env to etcd process. So, we don't need `-cpu` setting for E2E. Closes: etcd-io#17241 Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Jan 23, 2024
Assume etcd-io#16916 as baseline. The E2E takes `1395.082s`. * etcd-io#16988 It introduced `TestAuthority` which takes `18.39s`. And after etcd-io#16997, it takes `50.05s`. * etcd-io#16995 It introduced `TestInPlaceRecovery` which takes `17.37s`. * etcd-io#17144 - New `TestHTTPHealthHandler` takes `29.9s` - New `TestHTTPLivezReadyzHandler` takes `35.20s` * etcd-io#17173 - New `TestMemberReplace` takes `7.55s`. Ideally, it should increase `140.07s`. It's not larger than `1800s` timeout value. However, we run E2E cases 3 times. By default, we run E2E cases with `-cpu 1,2,4`. That means that we run 3 times. `1395.082s` + `140.07s * 3` = `1815.292s` > `1800s` ```bash $ go help testflag -count n Run each test, benchmark, and fuzz seed n times (default 1). If -cpu is set, run n times for each GOMAXPROCS value. Examples are always run once. -count does not apply to fuzz tests matched by -fuzz. ``` I don't think we should run E2E with different GOMAXPROCS value. All the `TestXYZ` are used to control etcd process and we don't set GOMAXPROCS env to etcd process. Set `CPU=4` to align with main and release/3.5. Closes: etcd-io#17241 Signed-off-by: Wei Fu <fuweid89@gmail.com>
fuweid
added a commit
to fuweid/etcd
that referenced
this pull request
Jan 23, 2024
Assume etcd-io#16916 as baseline. The E2E takes `1395.082s`. * etcd-io#16988 It introduced `TestAuthority` which takes `18.39s`. And after etcd-io#16997, it takes `50.05s`. * etcd-io#16995 It introduced `TestInPlaceRecovery` which takes `17.37s`. * etcd-io#17144 - New `TestHTTPHealthHandler` takes `29.9s` - New `TestHTTPLivezReadyzHandler` takes `35.20s` * etcd-io#17173 - New `TestMemberReplace` takes `7.55s`. Ideally, it should increase `140.07s`. It's not larger than `1800s` timeout value. However, we run E2E cases 3 times. By default, we run E2E cases with `-cpu 1,2,4`. That means that we run 3 times. `1395.082s` + `140.07s * 3` = `1815.292s` > `1800s` ```bash $ go help testflag -count n Run each test, benchmark, and fuzz seed n times (default 1). If -cpu is set, run n times for each GOMAXPROCS value. Examples are always run once. -count does not apply to fuzz tests matched by -fuzz. ``` I don't think we should run E2E with different GOMAXPROCS value. All the `TestXYZ` are used to control etcd process and we don't set GOMAXPROCS env to etcd process. Set `CPU=4` to align with main and release/3.5. Closes: etcd-io#17241 Signed-off-by: Wei Fu <fuweid89@gmail.com>
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.
Similar to #17083