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 39ea0c4337edca2a66f97a0e187101a6b0df7c31 into c86c93ca2951338115159dcdd20711603044e1f1

Browse Source
This commit is contained in:
Marek Siarkowicz 2024-09-26 22:00:12 +01:00 committed by GitHub
commit 974ee67492
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robustness/failpoint/failpoint.go
View File

@ -21,10 +21,10 @@ import (
"testing" "testing"
"time" "time"
"go.uber.org/zap"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.uber.org/zap"
"go.etcd.io/etcd/tests/v3/framework/e2e" "go.etcd.io/etcd/tests/v3/framework/e2e"
"go.etcd.io/etcd/tests/v3/robustness/identity" "go.etcd.io/etcd/tests/v3/robustness/identity"
"go.etcd.io/etcd/tests/v3/robustness/report" "go.etcd.io/etcd/tests/v3/robustness/report"
@ -112,27 +112,19 @@ func Inject(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2e.EtcdPro
func verifyClusterHealth(ctx context.Context, _ *testing.T, clus *e2e.EtcdProcessCluster) error { func verifyClusterHealth(ctx context.Context, _ *testing.T, clus *e2e.EtcdProcessCluster) error {
for i := 0; i < len(clus.Procs); i++ { for i := 0; i < len(clus.Procs); i++ {
clusterClient, err := clientv3.New(clientv3.Config{ c, err := clientv3.New(clientv3.Config{
Endpoints: clus.Procs[i].EndpointsGRPC(), Endpoints: clus.Procs[i].EndpointsGRPC(),
Logger: zap.NewNop(), Logger: zap.NewNop(),
DialKeepAliveTime: 10 * time.Second, DialKeepAliveTime: 10 * time.Second,
DialKeepAliveTimeout: 100 * time.Millisecond, DialKeepAliveTimeout: 100 * time.Millisecond,
}) })
if err != nil { if err != nil {
return fmt.Errorf("Error creating client for cluster %s: %v", clus.Procs[i].Config().Name, err) return fmt.Errorf("error creating client for member %s: %v", clus.Procs[i].Config().Name, err)
} }
defer clusterClient.Close() defer c.Close()
_, err = c.Get(ctx, "/fake")
cli := healthpb.NewHealthClient(clusterClient.ActiveConnection())
resp, err := cli.Check(ctx, &healthpb.HealthCheckRequest{})
if err != nil { if err != nil {
return fmt.Errorf("Error checking member %s health: %v", clus.Procs[i].Config().Name, err) return fmt.Errorf("error making get request to member %s, err: %v", clus.Procs[i].Config().Name, err)
}
if resp.Status != healthpb.HealthCheckResponse_SERVING {
return fmt.Errorf("Member %s health status expected %s, got %s",
clus.Procs[i].Config().Name,
healthpb.HealthCheckResponse_SERVING,
resp.Status)
} }
} }
return nil return nil