Skip to content

Assume v2 store is always not nil #19695

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

serathius
Copy link
Member

@serathius serathius commented Mar 30, 2025

I didn't find know any case where during server lifecycle v2store would be nil. I have a sad suspicion that this condition was introduced just for testing.

Would like to introduce hard assumption to v2 not being nil to ensure that it is properly tested and we are 100% sure that when we move to v3 storage the v2 is not used.

@k8s-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: serathius

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

@serathius
Copy link
Member Author

/retest

@serathius
Copy link
Member Author

/retest

@@ -34,10 +34,6 @@ func TestAddRemoveMember(t *testing.T) {
c.AddMember(newTestMember(18, nil, "node18", nil), true)
c.RemoveMember(18, true)

// Skipping removal of already removed member
Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like this test was totally incorrectly written?! It dependent on fact that v2store was not set at all.

@serathius
Copy link
Member Author

/retest

Copy link

codecov bot commented Mar 30, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.89%. Comparing base (839985d) to head (a420791).
Report is 73 commits behind head on main.

Additional details and impacted files
Files with missing lines Coverage Δ
server/etcdserver/api/membership/cluster.go 87.25% <100.00%> (-1.34%) ⬇️

... and 24 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19695      +/-   ##
==========================================
+ Coverage   68.76%   68.89%   +0.12%     
==========================================
  Files         421      421              
  Lines       35852    35847       -5     
==========================================
+ Hits        24655    24695      +40     
+ Misses       9773     9731      -42     
+ Partials     1424     1421       -3     

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 839985d...a420791. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@serathius
Copy link
Member Author

/retest

Signed-off-by: Marek Siarkowicz <[email protected]>
@serathius
Copy link
Member Author

/retest

@serathius serathius marked this pull request as ready for review March 31, 2025 21:03
@serathius
Copy link
Member Author

/retest

@ahrtr
Copy link
Member

ahrtr commented Apr 7, 2025

For release-3.6, I'd like to keep it as it's. For main branch, I suggest to cleanup v2store after 3.6.0 is released, to make the backport (main -> release-3.6) easier.

@serathius
Copy link
Member Author

SG

@k8s-ci-robot
Copy link

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@serathius
Copy link
Member Author

@ahrtr any progress with v3.6 release?

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