Skip to content

feat: Add UI for awaiting agent connections #578

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 14 commits into from
Mar 29, 2022
Merged

feat: Add UI for awaiting agent connections #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7ed283c
feat: Add stage to build logs
kylecarbs Mar 26, 2022
048f29a
feat: Add stage to build logs
kylecarbs Mar 26, 2022
2152758
feat: Add config-ssh and tests for resiliency
kylecarbs Mar 27, 2022
e774dd7
Merge branch 'nicerlogs' into ssh
kylecarbs Mar 27, 2022
172d4fe
Rename "Echo" test to "ImmediateExit"
kylecarbs Mar 27, 2022
82f60db
Fix Terraform resource agent association
kylecarbs Mar 27, 2022
6bff973
Fix logs post-cancel
kylecarbs Mar 27, 2022
3654022
Fix select on Windows
kylecarbs Mar 28, 2022
aef12e1
Remove terraform init logs
kylecarbs Mar 28, 2022
15cae15
Move timer into it's own loop
kylecarbs Mar 28, 2022
fb9fbb6
Fix race condition in provisioner jobs
kylecarbs Mar 28, 2022
c91b3cc
Merge branch 'main' into ssh
kylecarbs Mar 28, 2022
9ad326b
Merge branch 'main' into ssh
kylecarbs Mar 28, 2022
342b03d
Fix requested changes
kylecarbs Mar 29, 2022
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 condition in provisioner jobs
  • Loading branch information
@kylecarbs
kylecarbs committed Mar 28, 2022
commit fb9fbb6f121d280b2ab7562503bce76ca7c11e2e
16 changes: 9 additions & 7 deletions cli/cliui/provisionerjob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
printStage := func() {
_, _ = fmt.Fprintf(cmd.OutOrStdout(), Styles.Prompt.Render("⧗")+"%s\n", Styles.Field.Render(currentStage))
}
printStage()

updateStage := func(stage string, startedAt time.Time) {
if currentStage != "" {
Expand Down Expand Up @@ -104,9 +103,9 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
if opts.Cancel != nil {
// Handles ctrl+c to cancel a job.
stopChan := make(chan os.Signal, 1)
defer signal.Stop(stopChan)
signal.Notify(stopChan, os.Interrupt)
go func() {
signal.Notify(stopChan, os.Interrupt)
defer signal.Stop(stopChan)
select {
case <-ctx.Done():
return
Expand All @@ -115,8 +114,6 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
return
}
}
// Stop listening for signals so another one kills it!
signal.Stop(stopChan)
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "\033[2K\r\n"+Styles.FocusedPrompt.String()+Styles.Bold.Render("Gracefully canceling...")+"\n\n")
err := opts.Cancel()
if err != nil {
Expand All @@ -127,6 +124,9 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
}()
}

// The initial stage needs to print after the signal handler has been registered.
printStage()

logs, err := opts.Logs()
if err != nil {
return xerrors.Errorf("logs: %w", err)
Expand Down Expand Up @@ -159,8 +159,9 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
return nil
case codersdk.ProvisionerJobFailed:
}
err = xerrors.New(job.Error)
jobMutex.Unlock()
return xerrors.New(job.Error)
return err
}
output := ""
switch log.Level {
Expand All @@ -173,14 +174,15 @@ func ProvisionerJob(cmd *cobra.Command, opts ProvisionerJobOptions) error {
case database.LogLevelInfo:
output = log.Output
}
jobMutex.Lock()
if log.Stage != currentStage && log.Stage != "" {
jobMutex.Lock()
updateStage(log.Stage, log.CreatedAt)
jobMutex.Unlock()
continue
}
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s %s\n", Styles.Placeholder.Render(" "), output)
didLogBetweenStage = true
jobMutex.Unlock()
}
}
}
8 changes: 4 additions & 4 deletions cli/cliui/provisionerjob_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func TestProvisionerJob(t *testing.T) {
test.Job.Status = codersdk.ProvisionerJobSucceeded
now = database.Now()
test.Job.CompletedAt = &now
test.JobMutex.Unlock()
close(test.Logs)
test.JobMutex.Unlock()
}()
test.PTY.ExpectMatch("Queued")
test.Next <- struct{}{}
Expand Down Expand Up @@ -67,8 +67,8 @@ func TestProvisionerJob(t *testing.T) {
test.Job.Status = codersdk.ProvisionerJobSucceeded
now = database.Now()
test.Job.CompletedAt = &now
test.JobMutex.Unlock()
close(test.Logs)
test.JobMutex.Unlock()
}()
test.PTY.ExpectMatch("Queued")
test.Next <- struct{}{}
Expand All @@ -79,7 +79,7 @@ func TestProvisionerJob(t *testing.T) {
})

// This cannot be ran in parallel because it uses a signal.
//nolint:paralleltest
// nolint:paralleltest
t.Run("Cancel", func(t *testing.T) {
if runtime.GOOS == "windows" {
// Sending interrupt signal isn't supported on Windows!
Expand All @@ -98,8 +98,8 @@ func TestProvisionerJob(t *testing.T) {
test.Job.Status = codersdk.ProvisionerJobCanceled
now := database.Now()
test.Job.CompletedAt = &now
test.JobMutex.Unlock()
close(test.Logs)
test.JobMutex.Unlock()
}()
test.PTY.ExpectMatch("Queued")
test.Next <- struct{}{}
Expand Down