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

tests/robustness: Verify cluster configuration in failpoint availability

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2023-04-06 13:47:31 +02:00
parent 817aba57c7
commit 932415a8d5
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robustness/failpoints.go
View File

@ -92,7 +92,7 @@ func triggerFailpoints(ctx context.Context, t *testing.T, lg *zap.Logger, clus *
successes := 0 successes := 0
failures := 0 failures := 0
for _, proc := range clus.Procs { for _, proc := range clus.Procs {
if !config.failpoint.Available(proc) { if !config.failpoint.Available(*clus.Cfg, proc) {
t.Errorf("Failpoint %q not available on %s", config.failpoint.Name(), proc.Config().Name) t.Errorf("Failpoint %q not available on %s", config.failpoint.Name(), proc.Config().Name)
return return
} }
@ -173,7 +173,7 @@ type FailpointConfig struct {
type Failpoint interface { type Failpoint interface {
Trigger(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2e.EtcdProcessCluster) error Trigger(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2e.EtcdProcessCluster) error
Name() string Name() string
Available(e2e.EtcdProcess) bool Available(e2e.EtcdProcessClusterConfig, e2e.EtcdProcess) bool
} }
type killFailpoint struct{} type killFailpoint struct{}
@ -204,7 +204,7 @@ func (f killFailpoint) Name() string {
return "Kill" return "Kill"
} }
func (f killFailpoint) Available(e2e.EtcdProcess) bool { func (f killFailpoint) Available(e2e.EtcdProcessClusterConfig, e2e.EtcdProcess) bool {
return true return true
} }
@ -271,7 +271,10 @@ func (f goPanicFailpoint) pickMember(t *testing.T, clus *e2e.EtcdProcessCluster)
} }
} }
func (f goPanicFailpoint) Available(member e2e.EtcdProcess) bool { func (f goPanicFailpoint) Available(config e2e.EtcdProcessClusterConfig, member e2e.EtcdProcess) bool {
if f.target == Follower && config.ClusterSize == 1 {
return false
}
memberFailpoints := member.Failpoints() memberFailpoints := member.Failpoints()
if memberFailpoints == nil { if memberFailpoints == nil {
return false return false
@ -338,7 +341,7 @@ func (f randomFailpoint) Trigger(ctx context.Context, t *testing.T, lg *zap.Logg
for _, failpoint := range f.failpoints { for _, failpoint := range f.failpoints {
count := 0 count := 0
for _, proc := range clus.Procs { for _, proc := range clus.Procs {
if failpoint.Available(proc) { if failpoint.Available(*clus.Cfg, proc) {
count++ count++
} }
} }
@ -355,7 +358,7 @@ func (f randomFailpoint) Name() string {
return "Random" return "Random"
} }
func (f randomFailpoint) Available(e2e.EtcdProcess) bool { func (f randomFailpoint) Available(e2e.EtcdProcessClusterConfig, e2e.EtcdProcess) bool {
return true return true
} }
@ -461,8 +464,8 @@ func (f blackholePeerNetworkFailpoint) Name() string {
return "blackhole" return "blackhole"
} }
func (f blackholePeerNetworkFailpoint) Available(clus e2e.EtcdProcess) bool { func (f blackholePeerNetworkFailpoint) Available(config e2e.EtcdProcessClusterConfig, proc e2e.EtcdProcess) bool {
return clus.PeerProxy() != nil return config.ClusterSize > 1 && proc.PeerProxy() != nil
} }
type delayPeerNetworkFailpoint struct { type delayPeerNetworkFailpoint struct {
@ -489,6 +492,6 @@ func (f delayPeerNetworkFailpoint) Name() string {
return "delay" return "delay"
} }
func (f delayPeerNetworkFailpoint) Available(clus e2e.EtcdProcess) bool { func (f delayPeerNetworkFailpoint) Available(config e2e.EtcdProcessClusterConfig, proc e2e.EtcdProcess) bool {
return clus.PeerProxy() != nil return config.ClusterSize > 1 && proc.PeerProxy() != nil
} }