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.

Sign up for GitHub

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

Jump to bottom

tests: deflakey TestLeaseGrantTimeToLiveExpired #19476

Merged
merged 1 commit into from
Feb 25, 2025
Merged

tests: deflakey TestLeaseGrantTimeToLiveExpired #19476

merged 1 commit into from
Feb 25, 2025
+18 −2

Conversation

fuweid
Copy link
Member

@fuweid fuweid commented Feb 24, 2025

The following change can reproduce the issue #17504 by TESTCASE=TestLeaseGrantTimeToLiveExpired/PeerAutoTLS make test-e2e. We can retry it to reduce flakey possibility, if there is leader change.

diff --git a/tests/common/lease_test.go b/tests/common/lease_test.go
index afb27c330..dea8459dc 100644
--- a/tests/common/lease_test.go
+++ b/tests/common/lease_test.go
@@ -16,6 +16,7 @@ package common

 import (
        "context"
+       "sync"
        "testing"
        "time"

@@ -139,6 +140,18 @@ func TestLeaseGrantTimeToLiveExpired(t *testing.T) {
                                require.NoError(t, err)
                                require.Equal(t, int64(1), getResp.Count)

+                               var wg sync.WaitGroup
+                               defer wg.Wait()
+
+                               wg.Add(1)
+                               go func() {
+                                       defer wg.Done()
+                                       time.Sleep(1000 * time.Millisecond)
+                                       clus.(interface {
+                                               MoveLeader(ctx context.Context, t testing.TB, i int) error
+                                       }).MoveLeader(ctx, t, (clus.WaitLeader(t)+1)%len(clus.Members()))
+                               }()
+
                                time.Sleep(3 * time.Second)

                                ttlResp, err := cc.TimeToLive(ctx, leaseResp.ID, config.LeaseOption{})

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

@fuweid
Copy link
Member Author

fuweid commented Feb 24, 2025

cc @ahrtr @serathius @siyuanfoundation

@fuweid
tests: deflakey TestLeaseGrantTimeToLiveExpired
c81fb87 
The following change can reproduce the issue etcd-io#17504 by
`TESTCASE=TestLeaseGrantTimeToLiveExpired/PeerAutoTLS make test-e2e`. We
can retry it to reduce flakey possibility, if there is leader change.

```diff
diff --git a/tests/common/lease_test.go b/tests/common/lease_test.go
index afb27c330..dea8459dc 100644
--- a/tests/common/lease_test.go
+++ b/tests/common/lease_test.go
@@ -16,6 +16,7 @@ package common

 import (
        "context"
+       "sync"
        "testing"
        "time"

@@ -139,6 +140,18 @@ func TestLeaseGrantTimeToLiveExpired(t *testing.T) {
                                require.NoError(t, err)
                                require.Equal(t, int64(1), getResp.Count)

+                               var wg sync.WaitGroup
+                               defer wg.Wait()
+
+                               wg.Add(1)
+                               go func() {
+                                       defer wg.Done()
+                                       time.Sleep(1000 * time.Millisecond)
+                                       clus.(interface {
+                                               MoveLeader(ctx context.Context, t testing.TB, i int) error
+                                       }).MoveLeader(ctx, t, (clus.WaitLeader(t)+1)%len(clus.Members()))
+                               }()
+
                                time.Sleep(3 * time.Second)

                                ttlResp, err := cc.TimeToLive(ctx, leaseResp.ID, config.LeaseOption{})

```

Signed-off-by: Wei Fu <[email protected]>
@codecov Codecov
Copy link

codecov bot commented Feb 24, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.91%. Comparing base (43df62f) to head (c81fb87).
Report is 7 commits behind head on main.

Additional details and impacted files

see 21 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19476      +/-   ##
==========================================
+ Coverage   68.89%   68.91%   +0.02%     
==========================================
  Files         420      420              
  Lines       35762    35762              
==========================================
+ Hits        24638    24646       +8     
+ Misses       9699     9690       -9     
- Partials     1425     1426       +1

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 498bbc5...c81fb87. Read the comment docs.

serathius
serathius approved these changes Feb 25, 2025
View reviewed changes
Copy link
Member

@serathius serathius left a comment

Choose a reason for hiding this comment

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

+1 for deflaking the test.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

ahrtr commented Feb 25, 2025

Thanks for the good catch!

@ahrtr ahrtr merged commit 8e44d3a into etcd-io:main Feb 25, 2025
41 checks passed
@ahrtr
Copy link
Member

ahrtr commented Feb 25, 2025

/cherry-pick release-3.6

@ahrtr
Copy link
Member

ahrtr commented Feb 25, 2025

/cherry-pick release-3.5

@k8s-infra-cherrypick-robot
Copy link

@ahrtr: #19476 failed to apply on top of branch "release-3.6":

Applying: tests: deflakey TestLeaseGrantTimeToLiveExpired
error: patch failed: tests/common/lease_test.go:16
error: tests/common/lease_test.go: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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"
Using index info to reconstruct a base tree...
Patch failed at 0001 tests: deflakey TestLeaseGrantTimeToLiveExpired

In response to this:

/cherry-pick release-3.6

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.

@k8s-infra-cherrypick-robot
Copy link

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

Applying: tests: deflakey TestLeaseGrantTimeToLiveExpired
error: patch failed: tests/common/lease_test.go:16
error: tests/common/lease_test.go: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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"
Using index info to reconstruct a base tree...
A	tests/common/lease_test.go
Patch failed at 0001 tests: deflakey TestLeaseGrantTimeToLiveExpired

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 mentioned this pull request Feb 25, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serathius serathius serathius approved these changes

@ahrtr ahrtr ahrtr approved these changes

Assignees
No one assigned
Labels
approved area/testing size/S
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@fuweid @k8s-ci-robot @ahrtr @k8s-infra-cherrypick-robot @serathius