Skip to content

feat: integrate Acquirer for provisioner jobs #9717

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 12 commits into from
Sep 19, 2023
Merged

feat: integrate Acquirer for provisioner jobs #9717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e53245
chore: add Acquirer to provisionerdserver pkg
spikecurtis Sep 8, 2023
1ceac51
code review improvements & fixes
spikecurtis Sep 13, 2023
23d0e3c
feat: integrate Acquirer for provisioner jobs
spikecurtis Sep 13, 2023
bb22d9b
Merge branch 'main' of https://github.com/coder/coder into spike/9428…
spikecurtis Sep 18, 2023
403831c
Fix imports, whitespace
spikecurtis Sep 18, 2023
83df4d1
provisionerdserver always closes; remove poll interval from playwright
spikecurtis Sep 18, 2023
76d7ac7
post jobs outside transactions
spikecurtis Sep 18, 2023
13181b3
graceful shutdown in test
spikecurtis Sep 18, 2023
ab3a73b
Mark AcquireJob deprecated
spikecurtis Sep 18, 2023
d4070d2
Graceful shutdown on all provisionerd tests
spikecurtis Sep 18, 2023
e845140
Deprecate, not remove CLI flags
spikecurtis Sep 18, 2023
27162b7
Merge branch 'main' of https://github.com/coder/coder into spike/9428…
spikecurtis Sep 19, 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
provisionerdserver always closes; remove poll interval from playwright 
Signed-off-by: Spike Curtis <spike@coder.com>
  • Loading branch information
@spikecurtis
spikecurtis committed Sep 18, 2023
commit 83df4d11049951fbed03895bcd08e8d267d8a75c
13 changes: 10 additions & 3 deletions coderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,16 @@ type jobAndErr struct {
}

// AcquireJobWithCancel queries the database to lock a job.
func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_AcquireJobWithCancelStream) error {
func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_AcquireJobWithCancelStream) (retErr error) {
//nolint:gocritic // Provisionerd has specific authz rules.
streamCtx := dbauthz.AsProvisionerd(stream.Context())
defer func() {
closeErr := stream.Close()
s.Logger.Debug(streamCtx, "closed stream", slog.Error(closeErr))
if retErr == nil {
retErr = closeErr
}
}()
acqCtx, acqCancel := context.WithCancel(streamCtx)
defer acqCancel()
recvCh := make(chan error, 1)
Expand Down Expand Up @@ -243,7 +250,7 @@ func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_Acquire
s.Logger.Info(streamCtx, "failed to send empty job", slog.Error(err))
return err
}
return stream.Close()
return nil
}
if je.err != nil {
return xerrors.Errorf("acquire job: %w", je.err)
Expand Down Expand Up @@ -283,7 +290,7 @@ func (s *server) AcquireJobWithCancel(stream proto.DRPCProvisionerDaemon_Acquire
s.Logger.Error(streamCtx, "failed to send job", slog.Error(err))
return err
}
return stream.Close()
return nil
}

func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJob) (*proto.AcquiredJob, error) {
Expand Down
1 change: 0 additions & 1 deletion site/e2e/playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export default defineConfig({
`--dangerous-disable-rate-limits ` +
`--provisioner-daemons 10 ` +
`--provisioner-daemons-echo ` +
`--provisioner-daemon-poll-interval 50ms ` +
`--pprof-enable`,
env: {
...process.env,
Expand Down