Commit31076ad

authored

fix(enterprise/coderd): prevent deadlock during entitlements update (#8215)

1 parent5639541 commit31076adCopy full SHA for 31076ad

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,9 @@ type API struct {`
`313`	`313`	`// ProxyHealth checks the reachability of all workspace proxies.`
`314`	`314`	`ProxyHealth*proxyhealth.ProxyHealth`
`315`	`315`
`316`		`-entitlementsMu sync.RWMutex`
`317`		`-entitlements codersdk.Entitlements`
	`316`	`+entitlementsUpdateMu sync.Mutex`
	`317`	`+entitlementsMu sync.RWMutex`
	`318`	`+entitlements codersdk.Entitlements`
`318`	`319`	`}`
`319`	`320`
`320`	`321`	`func (api*API)Close()error {`
`@@ -329,8 +330,8 @@ func (api *API) Close() error {`
`329`	`330`	`}`
`330`	`331`
`331`	`332`	`func (api*API)updateEntitlements(ctx context.Context)error {`
`332`		`-api.entitlementsMu.Lock()`
`333`		`-deferapi.entitlementsMu.Unlock()`
	`333`	`+api.entitlementsUpdateMu.Lock()`
	`334`	`+deferapi.entitlementsUpdateMu.Unlock()`
`334`	`335`
`335`	`336`	`entitlements,err:=license.Entitlements(`
`336`	`337`	`ctx,api.Database,`
`@@ -457,6 +458,8 @@ func (api *API) updateEntitlements(ctx context.Context) error {`
`457`	`458`	`}`
`458`	`459`	`}`
`459`	`460`
	`461`	`+api.entitlementsMu.Lock()`
	`462`	`+deferapi.entitlementsMu.Unlock()`
`460`	`463`	`api.entitlements=entitlements`
`461`	`464`	`api.AGPL.SiteHandler.Entitlements.Store(&entitlements)`
`462`	`465`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func (api*API)shouldBlockNonBrowserConnections(rw http.ResponseWriter)bool {`
`12`		`-api.entitlementsMu.Lock()`
	`12`	`+api.entitlementsMu.RLock()`
`13`	`13`	`browserOnly:=api.entitlements.Features[codersdk.FeatureBrowserOnly].Enabled`
`14`		`-api.entitlementsMu.Unlock()`
	`14`	`+api.entitlementsMu.RUnlock()`
`15`	`15`	`ifbrowserOnly {`
`16`	`16`	`httpapi.Write(context.Background(),rw,http.StatusConflict, codersdk.Response{`
`17`	`17`	`Message:"Non-browser connections are disabled for your deployment.",`

Comments

(0)