NotificationsYou must be signed in to change notification settings
Fork1k
Star11.1k

Commit5369204

authored

[2.26 backport] perf(enterprise): remove expensive GetWorkspaces query from entitlements (#19747) (#19756)

This PR addresses the significant database load issue where theGetWorkspaces query was causing performance problems in the licenseentitlements code.cherry picked from commit3074547

1 parentc0f1b9d commit5369204Copy full SHA for 5369204

File tree

2 files changed

-49

lines changed

enterprise/coderd/license
- license.go
- license_test.go

2 files changed

-49

lines changed

`‎enterprise/coderd/license/license.go‎`

Lines changed: 8 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,17 +96,6 @@ func Entitlements(`
`96`	`96`	`return codersdk.Entitlements{},xerrors.Errorf("query active user count: %w",err)`
`97`	`97`	`}`
`98`	`98`
`99`		`-// nolint:gocritic // Getting external workspaces is a system function.`
`100`		`-externalWorkspaces,err:=db.GetWorkspaces(dbauthz.AsSystemRestricted(ctx), database.GetWorkspacesParams{`
`101`		`-HasExternalAgent: sql.NullBool{`
`102`		`-Bool:true,`
`103`		`-Valid:true,`
`104`		`-},`
`105`		`-})`
`106`		`-iferr!=nil {`
`107`		`-return codersdk.Entitlements{},xerrors.Errorf("query external workspaces: %w",err)`
`108`		`-}`
`109`		`-`
`110`	`99`	`// nolint:gocritic // Getting external templates is a system function.`
`111`	`100`	`externalTemplates,err:=db.GetTemplatesWithFilter(dbauthz.AsSystemRestricted(ctx), database.GetTemplatesWithFilterParams{`
`112`	`101`	`HasExternalAgent: sql.NullBool{`
`@@ -119,11 +108,10 @@ func Entitlements(`
`119`	`108`	`}`
`120`	`109`
`121`	`110`	`entitlements,err:=LicensesEntitlements(ctx,now,licenses,enablements,keys,FeatureArguments{`
`122`		`-ActiveUserCount:activeUserCount,`
`123`		`-ReplicaCount:replicaCount,`
`124`		`-ExternalAuthCount:externalAuthCount,`
`125`		`-ExternalWorkspaceCount:int64(len(externalWorkspaces)),`
`126`		`-ExternalTemplateCount:int64(len(externalTemplates)),`
	`111`	`+ActiveUserCount:activeUserCount,`
	`112`	`+ReplicaCount:replicaCount,`
	`113`	`+ExternalAuthCount:externalAuthCount,`
	`114`	`+ExternalTemplateCount:int64(len(externalTemplates)),`
`127`	`115`	`ManagedAgentCountFn:func(ctx context.Context,startTime time.Time,endTime time.Time) (int64,error) {`
`128`	`116`	`// This is not super accurate, as the start and end times will be`
`129`	`117`	`// truncated to the date in UTC timezone. This is an optimization`
`@@ -149,11 +137,10 @@ func Entitlements(`
`149`	`137`	`}`
`150`	`138`
`151`	`139`	`typeFeatureArgumentsstruct {`
`152`		`-ActiveUserCountint64`
`153`		`-ReplicaCountint`
`154`		`-ExternalAuthCountint`
`155`		`-ExternalWorkspaceCountint64`
`156`		`-ExternalTemplateCountint64`
	`140`	`+ActiveUserCountint64`
	`141`	`+ReplicaCountint`
	`142`	`+ExternalAuthCountint`
	`143`	`+ExternalTemplateCountint64`
`157`	`144`	`// Unfortunately, managed agent count is not a simple count of the current`
`158`	`145`	`// state of the world, but a count between two points in time determined by`
`159`	`146`	`// the licenses.`
`@@ -477,18 +464,6 @@ func LicensesEntitlements(`
`477`	`464`	`}`
`478`	`465`	`}`
`479`	`466`
`480`		`-iffeatureArguments.ExternalWorkspaceCount>0 {`
`481`		`-feature:=entitlements.Features[codersdk.FeatureWorkspaceExternalAgent]`
`482`		`-switchfeature.Entitlement {`
`483`		`-casecodersdk.EntitlementNotEntitled:`
`484`		`-entitlements.Errors=append(entitlements.Errors,`
`485`		`-"You have external workspaces but your license is not entitled to this feature.")`
`486`		`-casecodersdk.EntitlementGracePeriod:`
`487`		`-entitlements.Warnings=append(entitlements.Warnings,`
`488`		`-"You have external workspaces but your license is expired.")`
`489`		`-}`
`490`		`-}`
`491`		`-`
`492`	`467`	`iffeatureArguments.ExternalTemplateCount>0 {`
`493`	`468`	`feature:=entitlements.Features[codersdk.FeatureWorkspaceExternalAgent]`
`494`	`469`	`switchfeature.Entitlement {`

`‎enterprise/coderd/license/license_test.go‎`

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -843,9 +843,6 @@ func TestEntitlements(t *testing.T) {`
`843`	`843`	`returntrue`
`844`	`844`	`})).`
`845`	`845`	`Return(int64(175),nil)`
`846`		`-mDB.EXPECT().`
`847`		`-GetWorkspaces(gomock.Any(),gomock.Any()).`
`848`		`-Return([]database.GetWorkspacesRow{},nil)`
`849`	`846`	`mDB.EXPECT().`
`850`	`847`	`GetTemplatesWithFilter(gomock.Any(),gomock.Any()).`
`851`	`848`	`Return([]database.Template{},nil)`
`@@ -1236,19 +1233,6 @@ func TestLicenseEntitlements(t *testing.T) {`
`1236`	`1233`	`assert.Equal(t,int64(200),*feature.Actual)`
`1237`	`1234`	`},`
`1238`	`1235`	`},`
`1239`		`-{`
`1240`		`-Name:"ExternalWorkspace",`
`1241`		`-Licenses: []*coderdenttest.LicenseOptions{`
`1242`		`-enterpriseLicense().UserLimit(100),`
`1243`		`-},`
`1244`		`-Arguments: license.FeatureArguments{`
`1245`		`-ExternalWorkspaceCount:1,`
`1246`		`-},`
`1247`		`-AssertEntitlements:func(t*testing.T,entitlements codersdk.Entitlements) {`
`1248`		`-assert.Equal(t,codersdk.EntitlementEntitled,entitlements.Features[codersdk.FeatureWorkspaceExternalAgent].Entitlement)`
`1249`		`-assert.True(t,entitlements.Features[codersdk.FeatureWorkspaceExternalAgent].Enabled)`
`1250`		`-},`
`1251`		`-},`
`1252`	`1236`	`{`
`1253`	`1237`	`Name:"ExternalTemplate",`
`1254`	`1238`	`Licenses: []*coderdenttest.LicenseOptions{`

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!

Commit5369204

File tree

2 files changed

2 files changed

`‎enterprise/coderd/license/license.go‎`

`‎enterprise/coderd/license/license_test.go‎`

0 commit comments