Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

fix: Retry RTC connection attempts multiple times #348

Merged
merged 2 commits into from
May 12, 2021
Merged

fix: Retry RTC connection attempts multiple times #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f3e78
fix: Retry RTC connection attempts multiple times
kylecarbs May 12, 2021
6153a86
Fix test race with retryInterval
kylecarbs May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions wsnet/listen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"cdr.dev/coder-cli/coder-sdk"
)

var keepAliveInterval = 5 * time.Second
var connectionRetryInterval = time.Second

// Listen connects to the broker proxies connections to the local net.
// Close will end all RTC connections.
Expand All @@ -41,8 +41,19 @@ func Listen(ctx context.Context, broker string) (io.Closer, error) {
// If we hit an EOF, then the connection to the broker
// was interrupted. We'll take a short break then dial
// again.
time.Sleep(time.Second)
ch, err = l.dial(ctx)
ticker := time.NewTicker(connectionRetryInterval)
for {
select {
case <-ticker.C:
ch, err = l.dial(ctx)
case <-ctx.Done():
err = ctx.Err()
}
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
break
}
}
ticker.Stop()
}
if err != nil {
l.acceptError = err
Expand Down Expand Up @@ -79,7 +90,6 @@ func (l *listener) dial(ctx context.Context) (<-chan error, error) {
l.ws = conn
nconn := websocket.NetConn(ctx, conn, websocket.MessageBinary)
config := yamux.DefaultConfig()
config.KeepAliveInterval = keepAliveInterval
config.LogOutput = io.Discard
session, err := yamux.Server(nconn, config)
if err != nil {
Expand Down
22 changes: 16 additions & 6 deletions wsnet/listen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,27 @@ import (
"nhooyr.io/websocket"
)

func init() {
// We override this value to make tests faster.
connectionRetryInterval = 10 * time.Millisecond
}

func TestListen(t *testing.T) {
t.Run("Reconnect", func(t *testing.T) {
keepAliveInterval = 50 * time.Millisecond

var (
connCh = make(chan interface{})
connCh = make(chan *websocket.Conn)
mux = http.NewServeMux()
srv = http.Server{
Handler: mux,
}
)
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
_, err := websocket.Accept(w, r, nil)
ws, err := websocket.Accept(w, r, nil)
if err != nil {
t.Error(err)
return
}
connCh <- struct{}{}
connCh <- ws
})

listener, err := net.Listen("tcp4", "127.0.0.1:0")
Expand All @@ -47,8 +50,15 @@ func TestListen(t *testing.T) {
t.Error(err)
return
}
<-connCh
conn := <-connCh
_ = listener.Close()
// We need to close the connection too... closing a TCP
// listener does not close active local connections.
_ = conn.Close(websocket.StatusGoingAway, "")

// At least a few retry attempts should be had...
time.Sleep(connectionRetryInterval * 5)

listener, err = net.Listen("tcp4", addr.String())
if err != nil {
t.Error(err)
Expand Down