diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2016-11-18 19:06:04 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2016-11-18 19:06:04 +0100 |
| commit | e8de4be40738202695638f25c3607b2022c211c9 (patch) | |
| tree | 38393ecee3e924859acd1155a1674893413b6f9e | |
| parent | 50c9bc2948115c2e2840906f6a8c324946b557ca (diff) | |
manager: enable keepalives on rcp connections
VMs die frequently and it causes orphan tcp rpc connections on manager.
| -rw-r--r-- | syz-hub/hub.go | 11 | ||||
| -rw-r--r-- | syz-manager/manager.go | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/syz-hub/hub.go b/syz-hub/hub.go index 037f01d47..a203149c5 100644 --- a/syz-hub/hub.go +++ b/syz-hub/hub.go @@ -65,7 +65,16 @@ func main() { Logf(0, "serving rpc on tcp://%v", ln.Addr()) s := rpc.NewServer() s.Register(hub) - s.Accept(ln) + for { + conn, err := ln.Accept() + if err != nil { + Logf(0, "failed to accept an rpc connection: %v", err) + continue + } + conn.SetKeepAlive(true) + conn.SetKeepAlivePeriod(time.Minute) + go s.ServeConn(conn) + } } func (hub *Hub) Connect(a *HubConnectArgs, r *int) error { diff --git a/syz-manager/manager.go b/syz-manager/manager.go index 34de9b54c..0041432e0 100644 --- a/syz-manager/manager.go +++ b/syz-manager/manager.go @@ -169,6 +169,8 @@ func RunManager(cfg *config.Config, syscalls map[int]bool, suppressions []*regex Logf(0, "failed to accept an rpc connection: %v", err) continue } + conn.SetKeepAlive(true) + conn.SetKeepAlivePeriod(time.Minute) go s.ServeCodec(jsonrpc.NewServerCodec(conn)) } }() |
