github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #517 from jcvenegas/issue-516-timeout-centos

Browse Source 
agent: Increase timeout for check request.
This commit is contained in:
Sebastien Boeuf 2018-07-26 06:59:37 -07:00 committed by GitHub
commit c5075d08ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virtcontainers/kata_agent.go
View File

@ -34,6 +34,7 @@ import (
) )
var ( var (
checkRequestTimeout = 30 * time.Second
defaultKataSocketName = "kata.sock" defaultKataSocketName = "kata.sock"
defaultKataChannel = "agent.channel.0" defaultKataChannel = "agent.channel.0"
defaultKataDeviceID = "channel0" defaultKataDeviceID = "channel0"
@ -1229,8 +1230,12 @@ func (k *kataAgent) disconnect() error {
return nil return nil
} }
// check grpc server is serving
func (k *kataAgent) check() error { func (k *kataAgent) check() error {
_, err := k.sendReq(&grpc.CheckRequest{}) _, err := k.sendReq(&grpc.CheckRequest{})
if err != nil {
err = fmt.Errorf("Failed to check if grpc server is working: %s", err)
}
return err return err
} }
@ -1274,7 +1279,7 @@ type reqFunc func(context.Context, interface{}, ...golangGrpc.CallOption) (inter
func (k *kataAgent) installReqFunc(c *kataclient.AgentClient) { func (k *kataAgent) installReqFunc(c *kataclient.AgentClient) {
k.reqHandlers = make(map[string]reqFunc) k.reqHandlers = make(map[string]reqFunc)
k.reqHandlers["grpc.CheckRequest"] = func(ctx context.Context, req interface{}, opts ...golangGrpc.CallOption) (interface{}, error) { k.reqHandlers["grpc.CheckRequest"] = func(ctx context.Context, req interface{}, opts ...golangGrpc.CallOption) (interface{}, error) {
ctx, cancel := context.WithTimeout(ctx, 5*time.Second) ctx, cancel := context.WithTimeout(ctx, checkRequestTimeout)
defer cancel() defer cancel()
return k.client.Check(ctx, req.(*grpc.CheckRequest), opts...) return k.client.Check(ctx, req.(*grpc.CheckRequest), opts...)
} }