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.6] Backport DowngradeInfo proto change #19471

Merged
merged 5 commits into from
Feb 23, 2025

Conversation

fuweid
Copy link
Member

@fuweid fuweid commented Feb 23, 2025

Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 9d57554)
Signed-off-by: Wei Fu <[email protected]>
Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 8575de3)
Signed-off-by: Wei Fu <[email protected]>
Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 091b6ed)
Signed-off-by: Wei Fu <[email protected]>
1. Update DowngradeUpgradeMembersByID

If it's downgrading process, the desire version of cluster should be
target one.
If it's upgrading process, the desire version of cluster should be
determined by mininum binary version of members.

2. Remove AssertProcessLogs from DowngradeEnable

The log message "The server is ready to downgrade" appears only when the storage
version monitor detects a mismatch between the cluster and storage versions.

If traffic is insufficient to trigger a commit or if an auto-commit occurs right
after reading the storage version, the monitor may fail to update it, leading
to errors like:

```bash
"msg":"failed to update storage version","cluster-version":"3.6.0",
"error":"cannot detect storage schema version: missing confstate information"
```

Given this, we should remove the AssertProcessLogs statement.

Similar to etcd-io#19313

Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 65159a2)
Signed-off-by: Wei Fu <[email protected]>
Fixes: 65159a2 (*: Update cases related to Downgrade)

Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 2de17bd)
Signed-off-by: Wei Fu <[email protected]>
Copy link

codecov bot commented Feb 23, 2025

Codecov Report

Attention: Patch coverage is 50.00000% with 5 lines in your changes missing coverage. Please review.

Project coverage is 68.97%. Comparing base (0f89474) to head (a743e47).
Report is 6 commits behind head on release-3.6.

Files with missing lines Patch % Lines
etcdctl/ctlv3/command/printer.go 0.00% 3 Missing ⚠️
etcdctl/ctlv3/command/printer_fields.go 0.00% 2 Missing ⚠️
Additional details and impacted files
Files with missing lines Coverage Δ
server/etcdserver/api/v3rpc/maintenance.go 74.26% <100.00%> (+0.77%) ⬆️
etcdctl/ctlv3/command/printer_fields.go 0.00% <0.00%> (ø)
etcdctl/ctlv3/command/printer.go 0.00% <0.00%> (ø)

... and 22 files with indirect coverage changes

@@               Coverage Diff               @@
##           release-3.6   #19471      +/-   ##
===============================================
- Coverage        68.99%   68.97%   -0.03%     
===============================================
  Files              420      420              
  Lines            35753    35762       +9     
===============================================
- Hits             24669    24666       -3     
- Misses            9662     9674      +12     
  Partials          1422     1422              

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 0f89474...a743e47. Read the comment docs.

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

We need to update the 3.6 changelog as well.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, fuweid

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@ahrtr ahrtr merged commit 935f0c0 into etcd-io:release-3.6 Feb 23, 2025
39 checks passed
@ahrtr
Copy link
Member

ahrtr commented Feb 23, 2025

Link to #19456

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants