NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit90acf99

authored

fix: fix null pointer on external provisioner daemons with daily_cost (#9401)

* fix: fix null pointer on external provisioner daemons with daily_costSigned-off-by: Spike Curtis <spike@coder.com>* Add logging for debounce and job acquireSigned-off-by: Spike Curtis <spike@coder.com>* Return error instead of panicSigned-off-by: Spike Curtis <spike@coder.com>* remove debounce on external provisioners to fix test flakesSigned-off-by: Spike Curtis <spike@coder.com>---------Signed-off-by: Spike Curtis <spike@coder.com>

1 parenta415395 commit90acf99Copy full SHA for 90acf99

File tree

6 files changed

+664

-350

lines changed

coderd
- coderd.go
- provisionerdserver
  - provisionerdserver.go
  - provisionerdserver_test.go
enterprise/coderd
- provisionerdaemons.go
- provisionerdaemons_test.go
provisionerd
- provisionerd.go

6 files changed

+664

-350

lines changed

`‎coderd/coderd.go`

Lines changed: 25 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -1098,26 +1098,31 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti`
`1098`	`1098`	`}`
`1099`	`1099`
`1100`	`1100`	`mux:=drpcmux.New()`
`1101`		`-`
`1102`		`-err=proto.DRPCRegisterProvisionerDaemon(mux,&provisionerdserver.Server{`
`1103`		`-AccessURL:api.AccessURL,`
`1104`		`-ID:daemon.ID,`
`1105`		`-OIDCConfig:api.OIDCConfig,`
`1106`		`-Database:api.Database,`
`1107`		`-Pubsub:api.Pubsub,`
`1108`		`-Provisioners:daemon.Provisioners,`
`1109`		`-GitAuthConfigs:api.GitAuthConfigs,`
`1110`		`-Telemetry:api.Telemetry,`
`1111`		`-Tracer:tracer,`
`1112`		`-Tags:tags,`
`1113`		`-QuotaCommitter:&api.QuotaCommitter,`
`1114`		`-Auditor:&api.Auditor,`
`1115`		`-TemplateScheduleStore:api.TemplateScheduleStore,`
`1116`		`-UserQuietHoursScheduleStore:api.UserQuietHoursScheduleStore,`
`1117`		`-AcquireJobDebounce:debounce,`
`1118`		`-Logger:api.Logger.Named(fmt.Sprintf("provisionerd-%s",daemon.Name)),`
`1119`		`-DeploymentValues:api.DeploymentValues,`
`1120`		`-})`
	`1101`	`+srv,err:=provisionerdserver.NewServer(`
	`1102`	`+api.AccessURL,`
	`1103`	`+daemon.ID,`
	`1104`	`+api.Logger.Named(fmt.Sprintf("provisionerd-%s",daemon.Name)),`
	`1105`	`+daemon.Provisioners,`
	`1106`	`+tags,`
	`1107`	`+api.Database,`
	`1108`	`+api.Pubsub,`
	`1109`	`+api.Telemetry,`
	`1110`	`+tracer,`
	`1111`	`+&api.QuotaCommitter,`
	`1112`	`+&api.Auditor,`
	`1113`	`+api.TemplateScheduleStore,`
	`1114`	`+api.UserQuietHoursScheduleStore,`
	`1115`	`+api.DeploymentValues,`
	`1116`	`+debounce,`
	`1117`	`+provisionerdserver.Options{`
	`1118`	`+OIDCConfig:api.OIDCConfig,`
	`1119`	`+GitAuthConfigs:api.GitAuthConfigs,`
	`1120`	`+},`
	`1121`	`+)`
	`1122`	`+iferr!=nil {`
	`1123`	`+returnnil,err`
	`1124`	`+}`
	`1125`	`+err=proto.DRPCRegisterProvisionerDaemon(mux,srv)`
`1121`	`1126`	`iferr!=nil {`
`1122`	`1127`	`returnnil,err`
`1123`	`1128`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit90acf99

File tree

6 files changed

6 files changed

`‎coderd/coderd.go`

0 commit comments