[test] Add e2e downgrade automatic cancellation test #19399

henrybear327 · 2025-02-12T12:01:05Z

Verify that the downgrade can be cancelled automatically when the downgrade is completed (using no inflight downgrade job as the indicator)

Please see #19365 (comment)

Reference: #17976

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

Close #17976

codecov · 2025-02-12T12:19:41Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.83%. Comparing base (211f9e5) to head (9013a7f).
Report is 15 commits behind head on main.

Additional details and impacted files

see 25 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19399      +/-   ##
==========================================
+ Coverage   68.75%   68.83%   +0.07%     
==========================================
  Files         419      421       +2     
  Lines       35790    35855      +65     
==========================================
+ Hits        24608    24680      +72     
+ Misses       9763     9749      -14     
- Partials     1419     1426       +7

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1db0fc5...9013a7f. Read the comment docs.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

ahrtr

LGTM

cc @fuweid @siyuanfoundation @serathius

ahrtr · 2025-02-12T15:58:02Z

@henrybear327 can you please rebase this PR ? I just merged #19398

henrybear327 · 2025-02-12T15:59:33Z

@henrybear327 can you please rebase this PR ? I just merged #19398

Saw and done as you posted!

tests/e2e/cluster_downgrade_test.go

ahrtr

Please resolve the comments

k8s-ci-robot · 2025-02-12T16:27:26Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: henrybear327
Once this PR has been reviewed and has the lgtm label, please assign ahrtr for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

tests/e2e/cluster_downgrade_test.go

ahrtr · 2025-02-21T18:38:25Z

FYI. #19451 (comment)

3.5 has the auto downgrade cancellation as well, so this test case still makes sense. @fuweid @henrybear327

https://github.com/etcd-io/etcd/blob/release-3.5/server/etcdserver/server.go#L2724

ahrtr · 2025-02-21T18:39:59Z

FYI. #19451 (comment)

3.5 has the auto downgrade cancellation as well, so this test case still makes sense. @fuweid @henrybear327

https://github.com/etcd-io/etcd/blob/release-3.5/server/etcdserver/server.go#L2724

But 3.5 doesn't have the downgrade status query API. So this PR should be independent to #19451. So there is no need to wait for that PR. @fuweid @henrybear327 @siyuanfoundation

henrybear327 · 2025-02-22T12:55:31Z

FYI. #19451 (comment)

3.5 has the auto downgrade cancellation as well, so this test case still makes sense. @fuweid @henrybear327
https://github.com/etcd-io/etcd/blob/release-3.5/server/etcdserver/server.go#L2724

But 3.5 doesn't have the downgrade status query API. So this PR should be independent to #19451. So there is no need to wait for that PR. @fuweid @henrybear327 @siyuanfoundation

So ... is the conclusion to still merge this PR or no? Sorry that I am pretty lost during these exchanges.

ahrtr · 2025-02-22T14:30:28Z

So ... is the conclusion to still merge this PR or no?

YES. It's nice to merge this PR before next Tuesday. But it isn't a blocker for 3.6.0-rc.1.

henrybear327 · 2025-02-22T20:14:15Z

So ... is the conclusion to still merge this PR or no?

YES. It's nice to merge this PR before next Tuesday. But it isn't a blocker for 3.6.0-rc.1.

Got it! I have rebased it now, but I will likely complete addressing all comments and incorporating changes regarding cancellation status by Monday noon (as I am out on both days on the weekend).

Marking the PR as a draft now.

henrybear327 · 2025-03-06T20:58:19Z

/retest

henrybear327 · 2025-03-06T20:58:32Z

Ready for a final pass!

henrybear327 · 2025-03-20T10:32:50Z

/retest

siyuanfoundation · 2025-03-24T22:03:13Z

tests/e2e/cluster_downgrade_test.go

+	t.Log("Removing learner to test membership")
+	_, err = cc.MemberRemove(context.Background(), resp.Member.ID)
+	require.NoError(t, err)
+	beforeMembers, beforeKV := getMembersAndKeys(t, cc)


I think we should add writeKVs() before this, and in the other tests too.

siyuanfoundation · 2025-03-24T22:13:27Z

tests/e2e/cluster_downgrade_test.go

+	}
+
+	t.Log("Downgrade should be disabled")
+	e2e.ValidateDowngradeInfo(t, epc, &pb.DowngradeInfo{Enabled: false})


This validation does not seem very useful since the DowngradeInfo would always be false in 3.5. Which means we probably do not need this test ...

Verify that the downgrade can be cancelled automatically when the downgrade is completed (using `no inflight downgrade job`` as the indicator) Please see: etcd-io#19365 (comment) Reference: etcd-io#17976 Signed-off-by: Chun-Hung Tseng <[email protected]>

k8s-ci-robot added area/testing size/L labels Feb 12, 2025

henrybear327 requested review from ahrtr and siyuanfoundation February 12, 2025 12:01

henrybear327 self-assigned this Feb 12, 2025

henrybear327 changed the title ~~Add e2e downgrade automatic cancellation test~~ [test] Add e2e downgrade automatic cancellation test Feb 12, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch 2 times, most recently from 995bf3e to 60e8a40 Compare February 12, 2025 12:10

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 60e8a40 to 11357be Compare February 12, 2025 13:07

ahrtr approved these changes Feb 12, 2025

View reviewed changes

k8s-ci-robot added the approved label Feb 12, 2025

henrybear327 requested review from fuweid, ivanvc and serathius February 12, 2025 15:57

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 11357be to c0f2170 Compare February 12, 2025 15:59

ahrtr reviewed Feb 12, 2025

View reviewed changes

tests/e2e/cluster_downgrade_test.go Outdated Show resolved Hide resolved

ahrtr reviewed Feb 12, 2025

View reviewed changes

tests/e2e/cluster_downgrade_test.go Outdated Show resolved Hide resolved

tests/e2e/cluster_downgrade_test.go Outdated Show resolved Hide resolved

ahrtr reviewed Feb 12, 2025

View reviewed changes

tests/e2e/cluster_downgrade_test.go Outdated Show resolved Hide resolved

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from c0f2170 to 43e04f9 Compare February 12, 2025 16:14

ahrtr requested changes Feb 12, 2025

View reviewed changes

k8s-ci-robot removed the approved label Feb 12, 2025

ahrtr mentioned this pull request Feb 13, 2025

Add server level feature gate #18023

Closed

15 tasks

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 43e04f9 to a18de65 Compare February 13, 2025 20:35

ahrtr reviewed Feb 14, 2025

View reviewed changes

tests/e2e/cluster_downgrade_test.go Outdated Show resolved Hide resolved

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch 2 times, most recently from 7baf245 to f39e84e Compare February 15, 2025 01:36

k8s-ci-robot added the needs-rebase label Feb 22, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 24d1fc1 to 42e29c2 Compare February 22, 2025 20:09

k8s-ci-robot removed the needs-rebase label Feb 22, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 42e29c2 to 65ae06d Compare February 22, 2025 20:12

henrybear327 marked this pull request as draft February 22, 2025 20:13

k8s-ci-robot added the do-not-merge/work-in-progress label Feb 22, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 65ae06d to d004d39 Compare March 6, 2025 19:44

henrybear327 marked this pull request as ready for review March 6, 2025 20:31

k8s-ci-robot removed the do-not-merge/work-in-progress label Mar 6, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from d004d39 to a927742 Compare March 6, 2025 20:31

henrybear327 requested a review from ahrtr March 6, 2025 20:32

henrybear327 mentioned this pull request Mar 10, 2025

Add downgrade cancellation e2e tests #17976

Closed

k8s-ci-robot added the needs-rebase label Mar 15, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from a927742 to 8799e72 Compare March 16, 2025 21:43

k8s-ci-robot removed the needs-rebase label Mar 16, 2025

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 8799e72 to 8785910 Compare March 20, 2025 10:08

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from 8785910 to a514ebe Compare March 21, 2025 21:57

siyuanfoundation reviewed Mar 24, 2025

View reviewed changes

henrybear327 force-pushed the e2e/downgrade_auto_cancel branch from a514ebe to 9013a7f Compare March 24, 2025 23:55

henrybear327 closed this Mar 25, 2025

henrybear327 deleted the e2e/downgrade_auto_cancel branch August 25, 2025 09:23

[test] Add e2e downgrade automatic cancellation test #19399

[test] Add e2e downgrade automatic cancellation test #19399

Uh oh!

Conversation

henrybear327 commented Feb 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ahrtr left a comment

Choose a reason for hiding this comment

Uh oh!

ahrtr commented Feb 12, 2025

Uh oh!

henrybear327 commented Feb 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ahrtr left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Feb 12, 2025

Uh oh!

Uh oh!

ahrtr commented Feb 21, 2025

Uh oh!

ahrtr commented Feb 21, 2025

Uh oh!

henrybear327 commented Feb 22, 2025

Uh oh!

ahrtr commented Feb 22, 2025

Uh oh!

henrybear327 commented Feb 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

henrybear327 commented Mar 6, 2025

Uh oh!

henrybear327 commented Mar 6, 2025

Uh oh!

henrybear327 commented Mar 20, 2025

Uh oh!

siyuanfoundation Mar 24, 2025

Choose a reason for hiding this comment

Uh oh!

siyuanfoundation Mar 24, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

henrybear327 commented Feb 12, 2025 •

edited

Loading

codecov bot commented Feb 12, 2025 •

edited

Loading

henrybear327 commented Feb 22, 2025 •

edited

Loading