Add LIMA_SSH_OVER_VSOCK_TIMEOUT to configure the timeout for waiting for the SSH server on the VM

Signed-off-by: Norio Nomura <norio.nomura@gmail.com> change `grep -iq` to `grep -i` Signed-off-by: Norio Nomura <norio.nomura@gmail.com>

Author: norio-nomura

hack/test-templates.sh

@@ -349,23 +349,23 @@ if [[ -n ${CHECKS["ssh-over-vsock"]} ]]; then
 set -x
 INFO "Testing LIMA_SSH_OVER_VSOCK=true environment"
 limactl stop "${NAME}"
-if ! LIMA_SSH_OVER_VSOCK=true limactl start "${NAME}" 2>&1 | grep -iq "started vsock forwarder"; then
+if ! LIMA_SSH_OVER_VSOCK=true LIMA_SSH_OVER_VSOCK_TIMEOUT=60 limactl start "${NAME}" 2>&1 | grep -i "started vsock forwarder"; then
 set +x
 diagnose "${NAME}"
 ERROR "LIMA_SSH_OVER_VSOCK=true did not enable vsock forwarder"
 exit 1
 fi
 INFO 'Testing LIMA_SSH_OVER_VSOCK="" environment'
 limactl stop "${NAME}"
-if ! LIMA_SSH_OVER_VSOCK="" limactl start "${NAME}" 2>&1 | grep -iq "started vsock forwarder"; then
+if ! LIMA_SSH_OVER_VSOCK="" LIMA_SSH_OVER_VSOCK_TIMEOUT=60 limactl start "${NAME}" 2>&1 | grep -i "started vsock forwarder"; then
 set +x
 diagnose "${NAME}"
 ERROR "LIMA_SSH_OVER_VSOCK= did not enable vsock forwarder"
 exit 1
 fi
 INFO "Testing LIMA_SSH_OVER_VSOCK=false environment"
 limactl stop "${NAME}"
-if ! LIMA_SSH_OVER_VSOCK=false limactl start "${NAME}" 2>&1 | grep -iq "skipping detection of SSH server on vsock port"; then
+if ! LIMA_SSH_OVER_VSOCK=false LIMA_SSH_OVER_VSOCK_TIMEOUT=60 limactl start "${NAME}" 2>&1 | grep -i "skipping detection of SSH server on vsock port"; then
 set +x
 diagnose "${NAME}"
 ERROR "LIMA_SSH_OVER_VSOCK=false did not disable vsock forwarder"

pkg/networks/usernet/client.go

@@ -16,6 +16,7 @@ import (
 
 gvproxyclient "github.com/containers/gvisor-tap-vsock/pkg/client"
 "github.com/containers/gvisor-tap-vsock/pkg/types"
+"github.com/sirupsen/logrus"
 
 "github.com/lima-vm/lima/v2/pkg/httpclientutil"
 "github.com/lima-vm/lima/v2/pkg/limatype"
@@ -131,14 +132,24 @@ func (c *Client) Leases(ctx context.Context) (map[string]string, error) {
 
 // WaitOpeningSSHPort Wait until the guest ssh server is available.
 func (c *Client) WaitOpeningSSHPort(ctx context.Context, inst *limatype.Instance) error {
-ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+timeoutSeconds := 10
+if envVar := os.Getenv("LIMA_SSH_OVER_VSOCK_TIMEOUT"); envVar != "" {
+b, err := strconv.ParseInt(envVar, 10, 0)
+if err != nil {
+logrus.WithError(err).Warnf("invalid LIMA_SSH_OVER_VSOCK_TIMEOUT value %q", envVar)
+} else {
+logrus.Infof("Using LIMA_SSH_OVER_VSOCK_TIMEOUT=%d", b)
+timeoutSeconds = int(b)
+}
+}
+ctx, cancel := context.WithTimeout(ctx, time.Duration(timeoutSeconds)*time.Second)
 defer cancel()
 macAddress := limayaml.MACAddress(inst.Dir)
 ipAddr, err := c.ResolveIPAddress(ctx, macAddress)
 if err != nil {
 return err
 }
-u := fmt.Sprintf("%s/extension/wait_port?ip=%s&port=22", c.base, ipAddr)
+u := fmt.Sprintf("%s/extension/wait_port?ip=%s&port=22&timeout=%d", c.base, ipAddr, timeoutSeconds)
 res, err := httpclientutil.Get(ctx, c.client, u)
 if err != nil {
 return err

pkg/networks/usernet/gvproxy.go

@@ -256,9 +256,19 @@ func muxWithExtension(n *virtualnetwork.VirtualNetwork) *http.ServeMux {
 return
 }
 port := uint16(port16)
-ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-defer cancel()
 addr := fmt.Sprintf("%s:%d", ip, port)
+
+timeoutSeconds := 10
+if timeoutString := r.URL.Query().Get("timeout"); timeoutString != "" {
+timeout16, err := strconv.ParseUint(timeoutString, 10, 16)
+if err != nil {
+http.Error(w, err.Error(), http.StatusBadRequest)
+return
+}
+timeoutSeconds = int(timeout16)
+}
+ctx, cancel := context.WithTimeout(context.Background(), time.Duration(timeoutSeconds)*time.Second)
+defer cancel()
 // Wait until the port is available.
 for {
 conn, err := n.DialContextTCP(ctx, addr)