Skip to content

feat(cli/ssh): simplify log file flags #7863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 12, 2023
Merged

feat(cli/ssh): simplify log file flags #7863

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4b3b2bd
feat(cli/ssh): simplify log file flags
ammario Jun 5, 2023
82ce7a2
Fix race
ammario Jun 6, 2023
ad2c946
Fix race the right way
ammario Jun 6, 2023
1ca5930
Restore directory flag
ammario Jun 6, 2023
d7b26ad
Update tests
ammario Jun 6, 2023
48cb9b2
make
ammario Jun 6, 2023
3c43cfc
Merge remote-tracking branch 'origin/main' into log-race
ammario Jun 7, 2023
a1b68e5
mess around
ammario Jun 8, 2023
23a6833
Fix another race
ammario Jun 8, 2023
f17e7ce
fixup! Fix another race
ammario Jun 8, 2023
5a311b3
Update cli/ssh.go
ammario Jun 8, 2023
65cdbcc
Move CloseStdin into clibase
ammario Jun 9, 2023
d1cb325
Merge remote-tracking branch 'origin/main' into log-race
ammario Jun 9, 2023
8471555
Revert "Move CloseStdin into clibase"
ammario Jun 10, 2023
6593dfe
Merge remote-tracking branch 'origin/main' into log-race
ammario Jun 10, 2023
c5a1968
Spike-ify
ammario Jun 10, 2023
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
Prev Previous commit
Next Next commit
Fix race the right way
  • Loading branch information
@ammario
ammario committed Jun 6, 2023
commit ad2c946290107faf01c15d1aa133d0cca903b194
60 changes: 34 additions & 26 deletions cli/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os/exec"
"path/filepath"
"strings"
"sync"
"time"

"github.com/gen2brain/beeep"
Expand Down Expand Up @@ -77,18 +78,7 @@ func (r *RootCmd) ssh() *clibase.Cmd {
if err != nil {
return xerrors.Errorf("error opening %s for logging: %w", logFilePath, err)
}
// HACK: Something was keeping a reference to this file
// after the goroutine ends, leading to the race observed
// here: https://github.com/coder/coder/actions/runs/5178818818/jobs/9331016395.
rd, wr := io.Pipe()
go func() {
_, _ = io.Copy(logFile, rd)
}()
defer func() {
_ = wr.Close()
_ = logFile.Close()
}()
logger = slog.Make(sloghuman.Sink(wr))
logger = slog.Make(sloghuman.Sink(logFile))
if r.verbose {
logger = logger.Leveled(slog.LevelDebug)
}
Expand Down Expand Up @@ -157,15 +147,28 @@ func (r *RootCmd) ssh() *clibase.Cmd {
stopPolling := tryPollWorkspaceAutostop(ctx, client, workspace)
defer stopPolling()

// This WaitGroup solves for a race condition where we were logging
// while closing the log file in in a defer. It probably solves
// others too.
var wg sync.WaitGroup
defer wg.Wait()

if stdio {
rawSSH, err := conn.SSH(ctx)
if err != nil {
return xerrors.Errorf("connect SSH: %w", err)
}
defer rawSSH.Close()
go watchAndClose(ctx, rawSSH.Close, logger, client, workspace)

wg.Add(1)
go func() {
defer wg.Done()
watchAndClose(ctx, rawSSH.Close, logger, client, workspace)
}()

wg.Add(1)
go func() {
defer wg.Done()
// Ensure stdout copy closes incase stdin is closed
// unexpectedly. Typically we wouldn't worry about
// this since OpenSSH should kill the proxy command.
Expand Down Expand Up @@ -198,19 +201,24 @@ func (r *RootCmd) ssh() *clibase.Cmd {
return xerrors.Errorf("ssh session: %w", err)
}
defer sshSession.Close()
go watchAndClose(
ctx,
func() error {
err := sshSession.Close()
logger.Debug(ctx, "session close", slog.Error(err))
err = sshClient.Close()
logger.Debug(ctx, "client close", slog.Error(err))
return nil
},
logger,
client,
workspace,
)

wg.Add(1)
go func() {
defer wg.Done()
watchAndClose(
ctx,
func() error {
err := sshSession.Close()
logger.Debug(ctx, "session close", slog.Error(err))
err = sshClient.Close()
logger.Debug(ctx, "client close", slog.Error(err))
return nil
},
logger,
client,
workspace,
)
}()

if identityAgent == "" {
identityAgent = os.Getenv("SSH_AUTH_SOCK")
Expand Down