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

Remove the code of checking ClusterVersionSet in MinimalEtcdVersion #19263

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

ahrtr
Copy link
Member

@ahrtr ahrtr commented Jan 23, 2025

Link to #19168

@ahrtr
Copy link
Member Author

ahrtr commented Jan 23, 2025

The test failures are expected. I will fix them later.

@serathius PTAL

@ahrtr
Copy link
Member Author

ahrtr commented Jan 23, 2025

cc @fuweid @siyuanfoundation

Copy link

codecov bot commented Jan 23, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.86%. Comparing base (e289ba3) to head (3e5e79d).
Report is 2 commits behind head on main.

Additional details and impacted files
Files with missing lines Coverage Δ
server/storage/wal/version.go 51.92% <ø> (+0.38%) ⬆️

... and 15 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19263      +/-   ##
==========================================
+ Coverage   68.84%   68.86%   +0.02%     
==========================================
  Files         420      420              
  Lines       35681    35674       -7     
==========================================
+ Hits        24563    24566       +3     
+ Misses       9689     9686       -3     
+ Partials     1429     1422       -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 e289ba3...3e5e79d. Read the comment docs.

@siyuanfoundation
Copy link
Contributor

siyuanfoundation commented Jan 24, 2025

This would probably not impact 3.6->3.5. But for 3.7->3.6 downgrade with offline migration, if there is an entry of ClusterVersionSet to be applied after the downgrade, would that mean the cluster version be set to 3.7 when the old ClusterVersionSet entry is applied?

@ahrtr
Copy link
Member Author

ahrtr commented Jan 24, 2025

This would probably not impact 3.6->3.5.

This PR resolves the offline migration (3.6 -> 3.5) issue as mentioned in #19168 (comment).

would that mean the cluster version be set to 3.7 when the old ClusterVersionSet entry is applied?

Nope. The change in this PR only means the minimum etcd version to understand ClusterVersionSet is 3.5.

cc @serathius PTAL in case you have any further comment.

@ahrtr ahrtr force-pushed the cluster_ver_20250123 branch from aef91b8 to c3be3fd Compare January 24, 2025 10:57
@ahrtr ahrtr changed the title Treat ClusterVersionSet as 3.5 version Remove the code of checking ClusterVersionSet in MinimalEtcdVersion Jan 24, 2025
@ahrtr ahrtr force-pushed the cluster_ver_20250123 branch 3 times, most recently from 7e10811 to a08e5d3 Compare January 24, 2025 11:07
@ahrtr
Copy link
Member Author

ahrtr commented Jan 24, 2025

@serathius PTAL, thx

@ahrtr
Copy link
Member Author

ahrtr commented Jan 24, 2025

/test pull-etcd-integration-1-cpu-arm64

@ahrtr ahrtr force-pushed the cluster_ver_20250123 branch from a08e5d3 to 3e5e79d Compare January 24, 2025 14:24
@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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 1c840f8 into etcd-io:main Jan 24, 2025
34 checks passed
@ahrtr ahrtr deleted the cluster_ver_20250123 branch January 24, 2025 15:14
ahrtr added a commit to ahrtr/etcd that referenced this pull request Jan 25, 2025
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.

5 participants