diff --git a/tests/robustness/client.go b/tests/robustness/client.go index 295a43d80..625d561aa 100644 --- a/tests/robustness/client.go +++ b/tests/robustness/client.go @@ -36,8 +36,8 @@ func NewClient(endpoints []string, ids identity.Provider, baseTime time.Time) (* cc, err := clientv3.New(clientv3.Config{ Endpoints: endpoints, Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return nil, err diff --git a/tests/robustness/failpoints.go b/tests/robustness/failpoints.go index cb77ba2ee..907d57692 100644 --- a/tests/robustness/failpoints.go +++ b/tests/robustness/failpoints.go @@ -132,8 +132,8 @@ func verifyClusterHealth(ctx context.Context, t *testing.T, clus *e2e.EtcdProces clusterClient, err := clientv3.New(clientv3.Config{ Endpoints: clus.Procs[i].EndpointsGRPC(), Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return fmt.Errorf("Error creating client for cluster %s: %v", clus.Procs[i].Config().Name, err) @@ -298,8 +298,8 @@ func (t triggerDefrag) Trigger(_ *testing.T, ctx context.Context, member e2e.Etc cc, err := clientv3.New(clientv3.Config{ Endpoints: member.EndpointsGRPC(), Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return fmt.Errorf("failed creating client: %w", err) @@ -322,8 +322,8 @@ func (t triggerCompact) Trigger(_ *testing.T, ctx context.Context, member e2e.Et cc, err := clientv3.New(clientv3.Config{ Endpoints: member.EndpointsGRPC(), Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return fmt.Errorf("failed creating client: %w", err) @@ -444,8 +444,8 @@ func waitTillSnapshot(ctx context.Context, t *testing.T, clus *e2e.EtcdProcessCl clusterClient, err := clientv3.New(clientv3.Config{ Endpoints: endpoints, Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return err @@ -455,8 +455,8 @@ func waitTillSnapshot(ctx context.Context, t *testing.T, clus *e2e.EtcdProcessCl blackholedMemberClient, err := clientv3.New(clientv3.Config{ Endpoints: []string{blackholedMember.Config().ClientURL}, Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { return err @@ -491,9 +491,7 @@ func waitTillSnapshot(ctx context.Context, t *testing.T, clus *e2e.EtcdProcessCl // latestRevisionForEndpoint gets latest revision of the first endpoint in Client.Endpoints list func latestRevisionForEndpoint(ctx context.Context, c *clientv3.Client) (int64, error) { - cntx, cancel := context.WithTimeout(ctx, 100*time.Millisecond) - defer cancel() - resp, err := c.Status(cntx, c.Endpoints()[0]) + resp, err := c.Status(ctx, c.Endpoints()[0]) if err != nil { return 0, err } diff --git a/tests/robustness/watch.go b/tests/robustness/watch.go index c44d639f8..836e0ce2d 100644 --- a/tests/robustness/watch.go +++ b/tests/robustness/watch.go @@ -40,8 +40,8 @@ func collectClusterWatchEvents(ctx context.Context, t *testing.T, clus *e2e.Etcd c, err := clientv3.New(clientv3.Config{ Endpoints: member.EndpointsGRPC(), Logger: zap.NewNop(), - DialKeepAliveTime: 1 * time.Millisecond, - DialKeepAliveTimeout: 5 * time.Millisecond, + DialKeepAliveTime: 10 * time.Second, + DialKeepAliveTimeout: 100 * time.Millisecond, }) if err != nil { t.Fatal(err)