Adding default vsock connection timeout

Prior to this commit, io would be proxied from the VM to the host, but
no timeout is provided to the proxy. So if vsock has an issue, the io
would forever try to connect to the vsock leading to an extraneous
amount of errors. This commit adds a simple default timeout, 5 second,
which will eliminate the extraneous amount of logs

Signed-off-by: xibz <impactbchang@gmail.com>

Author: xibz

internal/vm/vsock.go

@@ -127,14 +127,16 @@ func (l vsockListener) Addr() net.Addr {
 
 // VSockDialConnector returns an IOConnector for establishing vsock connections
 // that are dialed from the host to a guest listener.
-func VSockDialConnector(udsPath string, port uint32) IOConnector {
+func VSockDialConnector(timeout time.Duration, udsPath string, port uint32) IOConnector {
 	return func(procCtx context.Context, logger *logrus.Entry) <-chan IOConnectorResult {
 		returnCh := make(chan IOConnectorResult)
 
 		go func() {
 			defer close(returnCh)
+			timeoutCtx, cancel := context.WithTimeout(procCtx, timeout)
+			defer cancel()
 
-			conn, err := VSockDial(procCtx, logger, udsPath, port)
+			conn, err := VSockDial(timeoutCtx, logger, udsPath, port)
 			returnCh <- IOConnectorResult{
 				ReadWriteCloser: conn,
 				Err:             err,

runtime/service.go

@@ -76,9 +76,10 @@ const (
 	// Firecracker's API server. The channel is closed once the VM starts.
 	vmReadyTimeout = 5 * time.Second
 
-	defaultCreateVMTimeout = 20 * time.Second
-	defaultStopVMTimeout   = 5 * time.Second
-	defaultShutdownTimeout = 5 * time.Second
+	defaultCreateVMTimeout     = 20 * time.Second
+	defaultStopVMTimeout       = 5 * time.Second
+	defaultShutdownTimeout     = 5 * time.Second
+	defaultVSockConnectTimeout = 5 * time.Second
 
 	jailerStopTimeout = 3 * time.Second
 
@@ -859,22 +860,22 @@ func (s *service) newIOProxy(logger *logrus.Entry, stdin, stdout, stderr string,
 		if stdin != "" {
 			stdinConnectorPair = &vm.IOConnectorPair{
 				ReadConnector:  vm.ReadFIFOConnector(stdin),
-				WriteConnector: vm.VSockDialConnector(relVSockPath, extraData.StdinPort),
+				WriteConnector: vm.VSockDialConnector(defaultVSockConnectTimeout, relVSockPath, extraData.StdinPort),
 			}
 		}
 
 		var stdoutConnectorPair *vm.IOConnectorPair
 		if stdout != "" {
 			stdoutConnectorPair = &vm.IOConnectorPair{
-				ReadConnector:  vm.VSockDialConnector(relVSockPath, extraData.StdoutPort),
+				ReadConnector:  vm.VSockDialConnector(defaultVSockConnectTimeout, relVSockPath, extraData.StdoutPort),
 				WriteConnector: vm.WriteFIFOConnector(stdout),
 			}
 		}
 
 		var stderrConnectorPair *vm.IOConnectorPair
 		if stderr != "" {
 			stderrConnectorPair = &vm.IOConnectorPair{
-				ReadConnector:  vm.VSockDialConnector(relVSockPath, extraData.StderrPort),
+				ReadConnector:  vm.VSockDialConnector(defaultVSockConnectTimeout, relVSockPath, extraData.StderrPort),
 				WriteConnector: vm.WriteFIFOConnector(stderr),
 			}
 		}