@@ -39,15 +39,16 @@ func TestServerGRPCKeepAliveTimeout(t *testing.T) {
39
39
defer testutil .AfterTest (t )
40
40
41
41
clus := integration .NewClusterV3 (t , & integration.ClusterConfig {
42
- Size : 2 ,
43
- GRPCKeepAliveInterval : 2 * time .Second ,
44
- GRPCKeepAliveTimeout : 1 * time .Second ,
42
+ Size : 1 ,
43
+ GRPCKeepAliveInterval : 1 * time .Second ,
44
+ GRPCKeepAliveTimeout : 500 * time .Millisecond ,
45
45
})
46
46
defer clus .Terminate (t )
47
47
48
48
eps := []string {clus .Members [0 ].GRPCAddr ()}
49
49
ccfg := clientv3.Config {
50
- Endpoints : []string {eps [0 ]},
50
+ Endpoints : []string {eps [0 ]},
51
+ DialTimeout : 10 * time .Second ,
51
52
}
52
53
cli , err := clientv3 .New (ccfg )
53
54
if err != nil {
@@ -58,17 +59,17 @@ func TestServerGRPCKeepAliveTimeout(t *testing.T) {
58
59
// give keepalive some time
59
60
time .Sleep (4 * time .Second )
60
61
61
- if _ , err = clus . Client ( 1 ) .Put (context .TODO (), "foo" , "bar" ); err != nil {
62
+ if _ , err = cli .Put (context .TODO (), "foo" , "bar" ); err != nil {
62
63
t .Fatal (err )
63
64
}
64
65
// TODO: keepalive sometimes doesn't work on first attempt.
65
66
for i := 0 ; i < 5 ; i ++ {
66
- clus .Members [1 ].Blackhole ()
67
- time .Sleep (10 * time .Second )
67
+ clus .Members [0 ].Blackhole ()
68
+ time .Sleep (8 * time .Second )
68
69
// remove blackhole but by now the keepalive ping should have triggered server to
69
70
// close server-to-client connection.
70
- clus .Members [1 ].Unblackhole ()
71
- _ , err = clus . Client ( 1 ) .Put (context .TODO (), "foo1" , "bar1" )
71
+ clus .Members [0 ].Unblackhole ()
72
+ _ , err = cli .Put (context .TODO (), "foo1" , "bar1" )
72
73
if err != nil {
73
74
ev , ok := status .FromError (err )
74
75
if ! ok {
0 commit comments