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

enable pre-vote by default and add retry on member_test

Browse Source 
Signed-off-by: Chao Chen <chaochn@amazon.com>
This commit is contained in:
Chao Chen 2023-03-17 15:15:13 -07:00
parent c6d8b65ea7
commit d7f992c351
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/common/member_test.go
View File

@ -19,6 +19,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
@ -49,11 +50,17 @@ func TestMemberList(t *testing.T) {
if expectNum != gotNum { if expectNum != gotNum {
t.Fatalf("number of members not equal, expect: %d, got: %d", expectNum, gotNum) t.Fatalf("number of members not equal, expect: %d, got: %d", expectNum, gotNum)
} }
for _, m := range resp.Members { assert.Eventually(t, func() (done bool) {
if len(m.ClientURLs) == 0 { for _, m := range resp.Members {
t.Fatalf("member is not started, memberId:%d, memberName:%s", m.ID, m.Name) if len(m.ClientURLs) == 0 {
t.Logf("member is not started, memberId:%d, memberName:%s", m.ID, m.Name)
done = false
return done
}
} }
} done = true
return true
}, time.Second*5, time.Millisecond*100)
}) })
}) })
} }

4
tests/framework/integration/cluster.go
View File

@ -37,6 +37,8 @@ import (
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest"
"go.etcd.io/raft/v3"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/client/pkg/v3/tlsutil" "go.etcd.io/etcd/client/pkg/v3/tlsutil"
@ -59,7 +61,6 @@ import (
"go.etcd.io/etcd/server/v3/verify" "go.etcd.io/etcd/server/v3/verify"
framecfg "go.etcd.io/etcd/tests/v3/framework/config" framecfg "go.etcd.io/etcd/tests/v3/framework/config"
"go.etcd.io/etcd/tests/v3/framework/testutils" "go.etcd.io/etcd/tests/v3/framework/testutils"
"go.etcd.io/raft/v3"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"
@ -662,6 +663,7 @@ func MustNewMember(t testutil.TB, mcfg MemberConfig) *Member {
m.ElectionTicks = ElectionTicks m.ElectionTicks = ElectionTicks
m.InitialElectionTickAdvance = true m.InitialElectionTickAdvance = true
m.TickMs = uint(framecfg.TickDuration / time.Millisecond) m.TickMs = uint(framecfg.TickDuration / time.Millisecond)
m.PreVote = true
m.QuotaBackendBytes = mcfg.QuotaBackendBytes m.QuotaBackendBytes = mcfg.QuotaBackendBytes
m.MaxTxnOps = mcfg.MaxTxnOps m.MaxTxnOps = mcfg.MaxTxnOps
if m.MaxTxnOps == 0 { if m.MaxTxnOps == 0 {