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.5] backport mix version e2e test. #17531

Merged
merged 1 commit into from
Apr 10, 2024
Merged

[3.5] backport mix version e2e test. #17531

merged 1 commit into from
Apr 10, 2024

Conversation

siyuanfoundation
Copy link
Contributor

@siyuanfoundation siyuanfoundation commented Mar 5, 2024 •
edited
Loading

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

Part of #15878 (comment)

Original PR: #14707 and #15013

Slightly different from the tests in main in that we cannot verify a snapshot is sent because there is no snapshot-catchup-entries flag in 3.5.

@siyuanfoundation
Copy link
Contributor Author

/retest

1 similar comment
@siyuanfoundation
Copy link
Contributor Author

/retest

@siyuanfoundation siyuanfoundation marked this pull request as draft March 6, 2024 00:32
@siyuanfoundation
Copy link
Contributor Author

/retest

@siyuanfoundation siyuanfoundation marked this pull request as ready for review March 6, 2024 06:14
@siyuanfoundation
Copy link
Contributor Author

siyuanfoundation commented Mar 7, 2024 •
edited
Loading

cc @serathius @ahrtr

@siyuanfoundation siyuanfoundation mentioned this pull request Mar 28, 2024
Merged
@ahrtr
Copy link
Member

ahrtr commented Mar 29, 2024

Please link to the original PR next time when you backport any PR.

ahrtr
ahrtr approved these changes Mar 29, 2024
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

cc @fuweid @jmhbnz @serathius double check

fuweid
fuweid reviewed Mar 29, 2024
View reviewed changes
tests/e2e/etcd_mix_versions_test.go Show resolved Hide resolved
tests/e2e/etcd_mix_versions_test.go
require.NoError(t, err, "failed to start etcd cluster: %v", err)
defer func() {
derr := epc.Close()
require.NoError(t, derr, "failed to close etcd cluster: %v", derr)
Copy link
Member

Choose a reason for hiding this comment

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

require.NoError(t, epx.Close(), "failed to close etcd cluster") might be cleaner.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If using require.NoError(t, epx.Close(), "failed to close etcd cluster"), we would not know what error is returned.

Copy link
Member

Choose a reason for hiding this comment

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

If epc.Close() is not nil, require.NoError will panic and show us.
Never mind. Just share that we don't need to pass error value in message.

tests/framework/e2e/config.go Outdated Show resolved Hide resolved
tests/e2e/etcd_mix_versions_test.go Outdated Show resolved Hide resolved
@siyuanfoundation
Copy link
Contributor Author

/retest

fuweid
fuweid approved these changes Mar 30, 2024
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

@serathius
Copy link
Member

Testing snapshot exchange between members in mixed version cluster is super useful! Thanks for adding those tests.

My suggestions:

  • Add scenario where there is a real network partition. Member downloading snapshot after being restarted is useful too, however I would prefer to also have a real network partition test. E2e test framework already supports separating member communication. You can check out robustness network blackhole failpoint.
  • Those tests should also exist between v3.6 and v3.5, I would suggest to first add them to the main branch, then we could backport the e2e framework tools and only at the end backport the test to v3.5.

@siyuanfoundation siyuanfoundation mentioned this pull request Apr 6, 2024
Draft
@siyuanfoundation
test: add mix version e2e test.
c06ec72 
Signed-off-by: Siyuan Zhang <sizhang@google.com>
@siyuanfoundation
Copy link
Contributor Author

Testing snapshot exchange between members in mixed version cluster is super useful! Thanks for adding those tests.

My suggestions:

  • Add scenario where there is a real network partition. Member downloading snapshot after being restarted is useful too, however I would prefer to also have a real network partition test. E2e test framework already supports separating member communication. You can check out robustness network blackhole failpoint.
  • Those tests should also exist between v3.6 and v3.5, I would suggest to first add them to the main branch, then we could backport the e2e framework tools and only at the end backport the test to v3.5.

The blackhole failpoint is problematic right now #17737

@serathius serathius merged commit dad2bab into etcd-io:release-3.5 Apr 10, 2024
24 checks passed
@siyuanfoundation siyuanfoundation mentioned this pull request Apr 11, 2024
Merged
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 @k8s-ci-robot