Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resovle some review comments

Browse Source 
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
This commit is contained in:
Benjamin Wang 2023-12-03 14:57:50 +00:00
parent 67f17166bf
commit f7ff898fd6
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/e2e/v3_lease_no_proxy_test.go
View File

@ -22,35 +22,27 @@ import (
"time" "time"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/e2e" "go.etcd.io/etcd/tests/v3/framework/e2e"
"go.etcd.io/etcd/tests/v3/framework/testutils" "go.etcd.io/etcd/tests/v3/framework/testutils"
) )
// TestLeaseRevokeByOldLeader verifies that leases shouldn't be revoked by // TestLeaseRevoke_IgnoreOldLeader verifies that leases shouldn't be revoked
// old leader. // by old leader.
// See the first case in the section "Root Cause" in // See the case 1 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
// https://docs.google.com/document/d/1peLDjwebnSuNR69ombuUiJ5fkSw7Rd3Slv_mUpOLsmg/edit func TestLeaseRevoke_IgnoreOldLeader(t *testing.T) {
func TestLeaseRevokeByOldLeader(t *testing.T) { testLeaseRevokeIssue(t, true)
testLeaseRevokeIssue(t, func(cluster *e2e.EtcdProcessCluster, leaderIndex int) []string {
// return the endpoint of a follower
return cluster.Procs[(leaderIndex+1)%len(cluster.Procs)].EndpointsGRPC()
})
} }
// TestLeaseRevokeByOldLeader verifies that leases shouldn't be revoked by // TestLeaseRevoke_ClientSwitchToOtherMember verifies that leases shouldn't
// new leader. // be revoked by new leader.
// See the second case in the section "Root Cause" in // See the case 2 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
// https://docs.google.com/document/d/1peLDjwebnSuNR69ombuUiJ5fkSw7Rd3Slv_mUpOLsmg/edit func TestLeaseRevoke_ClientSwitchToOtherMember(t *testing.T) {
func TestLeaseRevokeByNewLeader(t *testing.T) { testLeaseRevokeIssue(t, false)
testLeaseRevokeIssue(t, func(cluster *e2e.EtcdProcessCluster, leaderIndex int) []string {
// return all members' endpoints, so that the client can switch to
// other member in case the leader gets stuck on writing disk.
return cluster.EndpointsGRPC()
})
} }
func testLeaseRevokeIssue(t *testing.T, epsFn func(cluster *e2e.EtcdProcessCluster, leaderIndex int) []string) { func testLeaseRevokeIssue(t *testing.T, connectToOneFollower bool) {
e2e.BeforeTest(t) e2e.BeforeTest(t)
ctx := context.Background() ctx := context.Background()
@ -77,7 +69,12 @@ func testLeaseRevokeIssue(t *testing.T, epsFn func(cluster *e2e.EtcdProcessClust
require.NoError(t, err) require.NoError(t, err)
defer client.Close() defer client.Close()
epsForLeaseKeepAlive := epsFn(epc, leaderIdx) var epsForLeaseKeepAlive []string
if connectToOneFollower {
epsForLeaseKeepAlive = epc.Procs[(leaderIdx+1)%3].EndpointsGRPC()
} else {
epsForLeaseKeepAlive = epc.EndpointsGRPC()
}
t.Logf("Creating a client for the leaseKeepAlive operation: %v", epsForLeaseKeepAlive) t.Logf("Creating a client for the leaseKeepAlive operation: %v", epsForLeaseKeepAlive)
clientForKeepAlive, err := clientv3.New(clientv3.Config{Endpoints: epsForLeaseKeepAlive, DialTimeout: 3 * time.Second}) clientForKeepAlive, err := clientv3.New(clientv3.Config{Endpoints: epsForLeaseKeepAlive, DialTimeout: 3 * time.Second})
require.NoError(t, err) require.NoError(t, err)