diff --git a/pkg/agent/tunnelserver/lifecycle_terminal_client.go b/pkg/agent/tunnelserver/lifecycle_terminal_client.go index a66610082..681e50cc1 100644 --- a/pkg/agent/tunnelserver/lifecycle_terminal_client.go +++ b/pkg/agent/tunnelserver/lifecycle_terminal_client.go @@ -42,6 +42,7 @@ type terminalClient struct { active *terminalAttachment closed bool err error + recvErr error term string phase terminalClientPhase } @@ -257,10 +258,18 @@ func (s *terminalClient) Close(ctx context.Context) error { }, }, ) + if errors.Is(err, io.EOF) { + err = nil + } if err == nil { select { case <-s.recvDone: - if !errors.Is(s.failure(), io.EOF) { + s.mu.Lock() + rerr := s.recvErr + s.mu.Unlock() + if rerr != nil && !errors.Is(rerr, io.EOF) { + err = rerr + } else if !errors.Is(s.failure(), io.EOF) { err = s.failure() } case <-ctx.Done(): @@ -452,10 +461,16 @@ func (s *terminalClient) receiveLoop() { for { frame, err := s.stream.Recv() if err != nil { + s.mu.Lock() + s.recvErr = err + s.mu.Unlock() s.fail(err) return } if err = s.handleResponse(frame); err != nil { + s.mu.Lock() + s.recvErr = err + s.mu.Unlock() s.fail(err) return } @@ -594,7 +609,7 @@ func (s *terminalClient) handleCancel(f *tunnel.LifecycleTerminalResponse_Cancel func (s *terminalClient) fail(err error) { s.mu.Lock() - if s.err == nil { + if s.err == nil || (errors.Is(s.err, io.EOF) && !errors.Is(err, io.EOF)) { s.err = err } a := s.active @@ -622,10 +637,20 @@ func (s *terminalClient) sendItem(ctx context.Context, item terminalSend) error case err := <-item.done: return err case <-ctx.Done(): - s.fail(ctx.Err()) - return ctx.Err() + select { + case err := <-item.done: + return err + default: + s.fail(ctx.Err()) + return ctx.Err() + } case <-s.ctx.Done(): - return s.failure() + select { + case err := <-item.done: + return err + default: + return s.failure() + } } } @@ -645,9 +670,19 @@ func (s *terminalClient) sendOutput( case err := <-item.done: return err case <-ctx.Done(): - return ctx.Err() + select { + case err := <-item.done: + return err + default: + return ctx.Err() + } case <-s.ctx.Done(): - return s.failure() + select { + case err := <-item.done: + return err + default: + return s.failure() + } } } diff --git a/pkg/agent/tunnelserver/lifecycle_terminal_test.go b/pkg/agent/tunnelserver/lifecycle_terminal_test.go index a929ba833..98daf4ec0 100644 --- a/pkg/agent/tunnelserver/lifecycle_terminal_test.go +++ b/pkg/agent/tunnelserver/lifecycle_terminal_test.go @@ -428,6 +428,40 @@ func (s *terminalSuite) TestConcurrentOwnerSendsSerialize() { s.NoError(session.Close(context.Background())) } +func (s *terminalSuite) TestCloseAfterServerStreamClosed() { + release := make(chan struct{}) + owner := testTerminalOwner{ + serve: func(_ context.Context, st tunnel.Tunnel_LifecycleTerminalServer) error { + if err := ready(st); err != nil { + return err + } + <-release + return nil + }, + } + client := s.client(WithLifecycleTerminalOwner(owner, s.req)) + session, err := OpenLifecycleTerminal(context.Background(), client, s.req) + s.Require().NoError(err) + close(release) + s.Eventually( + func() bool { + tc, ok := session.(*terminalClient) + if !ok { + return false + } + select { + case <-tc.recvDone: + return true + default: + return false + } + }, + 5*time.Second, + 10*time.Millisecond, + ) + s.NoError(session.Close(context.Background())) +} + func (s *terminalSuite) TestGoroutinesExitAfterClose() { owner := testTerminalOwner{ serve: func(_ context.Context, st tunnel.Tunnel_LifecycleTerminalServer) error {