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

[3.4] fix: linux-amd64-e2e job timeout issue #17304

Merged
merged 1 commit into from
Jan 23, 2024

Conversation

fuweid
Copy link
Member

@fuweid fuweid commented Jan 23, 2024

Assume #16916 as baseline. The E2E takes 1395.082s.

It introduced TestAuthority which takes 18.39s. And after #16997, it takes 50.05s.

It introduced TestInPlaceRecovery which takes 17.37s.

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

$ 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: #17241

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

@fuweid
Copy link
Member Author

fuweid commented Jan 23, 2024

ping @ahrtr @serathius @jmhbnz

@ahrtr
Copy link
Member

ahrtr commented Jan 23, 2024

Thanks for the analysis.

I suggest one of the following solutions,

  • change the default value for TEST_CPUS to "1,4".

    etcd/test

    Line 120 in d441d74

    TEST_CPUS="1,2,4"
  • or breakdown linux-amd64-e2e into two targets: linux-amd64-e2e-1-cpu and linux-amd64-e2e-4-cpu.
  • [preferred] or just add an option CPU=4 for the target linux-amd64-e2e in tests.yaml (consistent with the main`` and release-3.5 branches)

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 <[email protected]>
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

Copy link
Member

@jmhbnz jmhbnz 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 for digging into this @fuweid

@ahrtr ahrtr merged commit 62e51c4 into etcd-io:release-3.4 Jan 23, 2024
12 checks passed
@fuweid fuweid deleted the fix-17241 branch January 23, 2024 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants