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/e2e: implement EtcdProcess GoFailClientTimeout

Browse Source 
Signed-off-by: Ivan Valdes <ivan@vald.es>
This commit is contained in:
Ivan Valdes 2024-02-15 10:50:26 -08:00
parent 6affeed9fd
commit ec4128af69
No known key found for this signature in database
GPG Key ID: 4037D37741ED0CC5
2 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/e2e/cluster_test.go
View File

@ -101,12 +101,13 @@ type etcdProcessCluster struct {
} }
type etcdProcessClusterConfig struct { type etcdProcessClusterConfig struct {
execPath string execPath string
dataDirPath string dataDirPath string
keepDataDir bool keepDataDir bool
goFailEnabled bool goFailEnabled bool
peerProxy bool goFailClientTimeout time.Duration
envVars map[string]string peerProxy bool
envVars map[string]string
clusterSize int clusterSize int
@ -348,20 +349,21 @@ func (cfg *etcdProcessClusterConfig) etcdServerProcessConfigs() []*etcdServerPro
} }
etcdCfgs[i] = &etcdServerProcessConfig{ etcdCfgs[i] = &etcdServerProcessConfig{
execPath: cfg.execPath, execPath: cfg.execPath,
args: args, args: args,
envVars: envVars, envVars: envVars,
tlsArgs: cfg.tlsArgs(), tlsArgs: cfg.tlsArgs(),
dataDirPath: dataDirPath, dataDirPath: dataDirPath,
keepDataDir: cfg.keepDataDir, keepDataDir: cfg.keepDataDir,
name: name, name: name,
purl: peerAdvertiseUrl, purl: peerAdvertiseUrl,
acurl: curl, acurl: curl,
murl: murl, murl: murl,
initialToken: cfg.initialToken, initialToken: cfg.initialToken,
clientHttpUrl: clientHttpUrl, clientHttpUrl: clientHttpUrl,
goFailPort: gofailPort, goFailPort: gofailPort,
proxy: proxyCfg, goFailClientTimeout: cfg.goFailClientTimeout,
proxy: proxyCfg,
} }
} }

28
tests/e2e/etcd_process.go
View File

@ -92,8 +92,9 @@ type etcdServerProcessConfig struct {
initialToken string initialToken string
initialCluster string initialCluster string
proxy *proxy.ServerConfig proxy *proxy.ServerConfig
goFailPort int goFailPort int
goFailClientTimeout time.Duration
} }
func newEtcdServerProcess(cfg *etcdServerProcessConfig) (*etcdServerProcess, error) { func newEtcdServerProcess(cfg *etcdServerProcessConfig) (*etcdServerProcess, error) {
@ -107,8 +108,12 @@ func newEtcdServerProcess(cfg *etcdServerProcessConfig) (*etcdServerProcess, err
} }
ep := &etcdServerProcess{cfg: cfg, donec: make(chan struct{})} ep := &etcdServerProcess{cfg: cfg, donec: make(chan struct{})}
if cfg.goFailPort != 0 { if cfg.goFailPort != 0 {
ep.failpoints = &BinaryFailpoints{member: ep} ep.failpoints = &BinaryFailpoints{
member: ep,
clientTimeout: cfg.goFailClientTimeout,
}
} }
return ep, nil return ep, nil
} }
@ -232,6 +237,7 @@ func (ep *etcdServerProcess) Etcdctl(connType clientConnType, isAutoTLS, v2 bool
type BinaryFailpoints struct { type BinaryFailpoints struct {
member etcdProcess member etcdProcess
availableCache map[string]string availableCache map[string]string
clientTimeout time.Duration
} }
func (f *BinaryFailpoints) SetupEnv(failpoint, payload string) error { func (f *BinaryFailpoints) SetupEnv(failpoint, payload string) error {
@ -253,6 +259,12 @@ func (f *BinaryFailpoints) SetupHTTP(ctx context.Context, failpoint, payload str
if err != nil { if err != nil {
return err return err
} }
httpClient := http.Client{
Timeout: 1 * time.Second,
}
if f.clientTimeout != 0 {
httpClient.Timeout = f.clientTimeout
}
resp, err := httpClient.Do(r) resp, err := httpClient.Do(r)
if err != nil { if err != nil {
return err return err
@ -275,6 +287,12 @@ func (f *BinaryFailpoints) DeactivateHTTP(ctx context.Context, failpoint string)
if err != nil { if err != nil {
return err return err
} }
httpClient := http.Client{
Timeout: 1 * time.Second,
}
if f.clientTimeout != 0 {
httpClient.Timeout = f.clientTimeout
}
resp, err := httpClient.Do(r) resp, err := httpClient.Do(r)
if err != nil { if err != nil {
return err return err
@ -286,10 +304,6 @@ func (f *BinaryFailpoints) DeactivateHTTP(ctx context.Context, failpoint string)
return nil return nil
} }
var httpClient = http.Client{
Timeout: 1 * time.Second,
}
func (f *BinaryFailpoints) Enabled() bool { func (f *BinaryFailpoints) Enabled() bool {
_, err := failpoints(f.member) _, err := failpoints(f.member)
if err != nil { if err != nil {