Adds a timeout context to the ssh waiter to prevent indefinite hanging

reybard · reybard · commit c18e54189ce3 · 2021-10-27T15:40:49.000-07:00
diff --git a/pkg/liveshare/rpc.go b/pkg/liveshare/rpc.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"time"
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/sourcegraph/jsonrpc2"
@@ -32,7 +33,11 @@ func (r *rpcClient) do(ctx context.Context, method string, args, result interfac
 		return fmt.Errorf("error dispatching %q call: %w", method, err)
 	}
 
-	return waiter.Wait(ctx, result)
+	// timeout for waiter in case a connection cannot be made
+	waitCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
+	defer cancel()
+
+	return waiter.Wait(waitCtx, result)
 }
 
 type nullHandler struct{}
