Merge pull request kata-containers#295 from lifupan/hyper-integration

agent: disable yamux keep alive
zklei · Jul 7, 2018 · 277c8f0 · 277c8f0
2 parents b161535 + cf8d3c8
commit 277c8f0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/protocols/client/client.go b/protocols/client/client.go
@@ -147,7 +147,10 @@ func agentDialer(addr *url.URL, enableYamux bool) dialer {
 		}()
 
 		var session *yamux.Session
-		session, err = yamux.Client(conn, nil)
+		sessionConfig := yamux.DefaultConfig()
+		// Disable keepAlive since we don't know how much time a container can be paused
+		sessionConfig.EnableKeepAlive = false
+		session, err = yamux.Client(conn, sessionConfig)
 		if err != nil {
 			return nil, err
 		}