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

Merge pull request #18452 from ahrtr/lease_5members_20240816_3.4

Browse Source 
[3.4] test: extend leaseRevoke and leaseRenew test to support 5 members cluster
This commit is contained in:
Benjamin Wang 2024-08-16 16:01:08 +01:00 committed by GitHub
commit e0ef96983f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/e2e/v3_lease_no_proxy_test.go
View File

@ -31,24 +31,34 @@ import (
// by old leader. // by old leader.
// See the case 1 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093. // See the case 1 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
func TestLeaseRevoke_IgnoreOldLeader(t *testing.T) { func TestLeaseRevoke_IgnoreOldLeader(t *testing.T) {
testLeaseRevokeIssue(t, true) t.Run("3 members", func(t *testing.T) {
testLeaseRevokeIssue(t, 3, true)
})
t.Run("5 members", func(t *testing.T) {
testLeaseRevokeIssue(t, 5, true)
})
} }
// TestLeaseRevoke_ClientSwitchToOtherMember verifies that leases shouldn't // TestLeaseRevoke_ClientSwitchToOtherMember verifies that leases shouldn't
// be revoked by new leader. // be revoked by new leader.
// See the case 2 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093. // See the case 2 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
func TestLeaseRevoke_ClientSwitchToOtherMember(t *testing.T) { func TestLeaseRevoke_ClientSwitchToOtherMember(t *testing.T) {
testLeaseRevokeIssue(t, false) t.Run("3 members", func(t *testing.T) {
testLeaseRevokeIssue(t, 3, false)
})
t.Run("5 members", func(t *testing.T) {
testLeaseRevokeIssue(t, 5, false)
})
} }
func testLeaseRevokeIssue(t *testing.T, connectToOneFollower bool) { func testLeaseRevokeIssue(t *testing.T, clusterSize int, connectToOneFollower bool) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
ctx := context.Background() ctx := context.Background()
t.Log("Starting a new etcd cluster") t.Log("Starting a new etcd cluster")
epc, err := newEtcdProcessCluster(t, &etcdProcessClusterConfig{ epc, err := newEtcdProcessCluster(t, &etcdProcessClusterConfig{
clusterSize: 3, clusterSize: clusterSize,
goFailEnabled: true, goFailEnabled: true,
goFailClientTimeout: 40 * time.Second, goFailClientTimeout: 40 * time.Second,
}) })
@ -62,7 +72,7 @@ func testLeaseRevokeIssue(t *testing.T, connectToOneFollower bool) {
leaderIdx := epc.WaitLeader(t) leaderIdx := epc.WaitLeader(t)
t.Logf("Leader index: %d", leaderIdx) t.Logf("Leader index: %d", leaderIdx)
epsForNormalOperations := epc.procs[(leaderIdx+2)%3].EndpointsGRPC() epsForNormalOperations := epc.procs[(leaderIdx+2)%clusterSize].EndpointsGRPC()
t.Logf("Creating a client for normal operations: %v", epsForNormalOperations) t.Logf("Creating a client for normal operations: %v", epsForNormalOperations)
client, err := clientv3.New(clientv3.Config{Endpoints: epsForNormalOperations, DialTimeout: 3 * time.Second}) client, err := clientv3.New(clientv3.Config{Endpoints: epsForNormalOperations, DialTimeout: 3 * time.Second})
require.NoError(t, err) require.NoError(t, err)
@ -70,7 +80,7 @@ func testLeaseRevokeIssue(t *testing.T, connectToOneFollower bool) {
var epsForLeaseKeepAlive []string var epsForLeaseKeepAlive []string
if connectToOneFollower { if connectToOneFollower {
epsForLeaseKeepAlive = epc.procs[(leaderIdx+1)%3].EndpointsGRPC() epsForLeaseKeepAlive = epc.procs[(leaderIdx+1)%clusterSize].EndpointsGRPC()
} else { } else {
epsForLeaseKeepAlive = epc.EndpointsGRPC() epsForLeaseKeepAlive = epc.EndpointsGRPC()
} }