vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add grpc health check service

Browse source 
Also, block on dial in integration tests

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
This commit is contained in:
Alexander Morozov 2016-09-09 13:14:47 -07:00
parent 35a736c471
commit d5f9910cee
5 changed files with 255 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
integration-test/check_test.go
View file

@ -17,6 +17,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/health/grpc_health_v1"
"github.com/docker/containerd/api/grpc/types"
utils "github.com/docker/containerd/testutils"
@ -60,12 +61,18 @@ func (cs *ContainerdSuite) getClient(socket string) error {
dialOpts = append(dialOpts,
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
return net.DialTimeout(bindParts[0], bindParts[1], timeout)
},
))
}),
grpc.WithBlock(),
grpc.WithTimeout(5*time.Second),
)
conn, err := grpc.Dial(socket, dialOpts...)
if err != nil {
return err
}
healthClient := grpc_health_v1.NewHealthClient(conn)
if _, err := healthClient.Check(context.Background(), &grpc_health_v1.HealthCheckRequest{}); err != nil {
return err
}
cs.grpcClient = types.NewAPIClient(conn)
return nil