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

Fix mixVersion test case: ensure a snapshot to be sent out #19140

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

ahrtr
Copy link
Member

@ahrtr ahrtr commented Jan 7, 2025

The test case TestMixVersionsSnapshotByMockingPartition is flaky. Sometimes, when the partitioned member gets restarted, its consistentIndex might be 8 or 9. If it's 9, it's exactly the latestSnapshotIndex - SnapshotCatchUpEntries, accordingly the leader won't send a snapshot.

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
@ahrtr
Copy link
Member Author

ahrtr commented Jan 7, 2025

Copy link

codecov bot commented Jan 7, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.78%. Comparing base (aac7ef6) to head (3ee0d4f).
Report is 2 commits behind head on main.

Additional details and impacted files
Files with missing lines Coverage Δ
server/etcdserver/bootstrap.go 63.59% <100.00%> (ø)

... and 25 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19140      +/-   ##
==========================================
+ Coverage   68.73%   68.78%   +0.04%     
==========================================
  Files         420      420              
  Lines       35640    35640              
==========================================
+ Hits        24498    24515      +17     
+ Misses       9717     9696      -21     
- Partials     1425     1429       +4     

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 aac7ef6...3ee0d4f. Read the comment docs.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, 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

@ahrtr ahrtr merged commit 70a1726 into etcd-io:main Jan 8, 2025
36 checks passed
@ahrtr
Copy link
Member Author

ahrtr commented Jan 8, 2025

/cherry-pick release-3.5

@k8s-infra-cherrypick-robot

@ahrtr: #19140 failed to apply on top of branch "release-3.5":

Applying: Fix mixVersion test case: ensure a snapshot to be sent out
Using index info to reconstruct a base tree...
A	server/etcdserver/bootstrap.go
M	tests/e2e/etcd_mix_versions_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/etcd_mix_versions_test.go
CONFLICT (content): Merge conflict in tests/e2e/etcd_mix_versions_test.go
CONFLICT (modify/delete): server/etcdserver/bootstrap.go deleted in HEAD and modified in Fix mixVersion test case: ensure a snapshot to be sent out. Version Fix mixVersion test case: ensure a snapshot to be sent out of server/etcdserver/bootstrap.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix mixVersion test case: ensure a snapshot to be sent out

In response to this:

/cherry-pick release-3.5

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.

@ahrtr ahrtr deleted the mix_version_test_20250107 branch January 8, 2025 14:15
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.

4 participants