Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: use NoLock dbmem subqueries for GetWorkspaceAgentScriptTimingsByBuildID #15405

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 1 commit into from
Nov 6, 2024
Merged

fix: use NoLock dbmem subqueries for GetWorkspaceAgentScriptTimingsByBuildID #15405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: avoid sharing t in TestWorkspaceBuildTimings
  • Loading branch information
@ethanndickson
ethanndickson committed Nov 6, 2024
commit ba8e8cd396c3272fbecb1d9c69f9c8fa5801dbcd
32 changes: 18 additions & 14 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,19 @@ func (q *FakeQuerier) getOrganizationByIDNoLock(id uuid.UUID) (database.Organiza
return database.Organization{}, sql.ErrNoRows
}

func (q *FakeQuerier) getWorkspaceAgentScriptsByAgentIDsNoLock(ids []uuid.UUID) ([]database.WorkspaceAgentScript, error) {
scripts := make([]database.WorkspaceAgentScript, 0)
for _, script := range q.workspaceAgentScripts {
for _, id := range ids {
if script.WorkspaceAgentID == id {
scripts = append(scripts, script)
break
}
}
}
return scripts, nil
}

func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
return xerrors.New("AcquireLock must only be called within a transaction")
}
Expand Down Expand Up @@ -5854,12 +5867,12 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
q.mutex.RLock()
defer q.mutex.RUnlock()

build, err := q.GetWorkspaceBuildByID(ctx, id)
build, err := q.getWorkspaceBuildByIDNoLock(ctx, id)
if err != nil {
return nil, xerrors.Errorf("get build: %w", err)
}

resources, err := q.GetWorkspaceResourcesByJobID(ctx, build.JobID)
resources, err := q.getWorkspaceResourcesByJobIDNoLock(ctx, build.JobID)
if err != nil {
return nil, xerrors.Errorf("get resources: %w", err)
}
Expand All @@ -5868,7 +5881,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
resourceIDs = append(resourceIDs, res.ID)
}

agents, err := q.GetWorkspaceAgentsByResourceIDs(ctx, resourceIDs)
agents, err := q.getWorkspaceAgentsByResourceIDsNoLock(ctx, resourceIDs)
if err != nil {
return nil, xerrors.Errorf("get agents: %w", err)
}
Expand All @@ -5877,7 +5890,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
agentIDs = append(agentIDs, agent.ID)
}

scripts, err := q.GetWorkspaceAgentScriptsByAgentIDs(ctx, agentIDs)
scripts, err := q.getWorkspaceAgentScriptsByAgentIDsNoLock(agentIDs)
if err != nil {
return nil, xerrors.Errorf("get scripts: %w", err)
}
Expand Down Expand Up @@ -5933,16 +5946,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptsByAgentIDs(_ context.Context, ids
q.mutex.RLock()
defer q.mutex.RUnlock()

scripts := make([]database.WorkspaceAgentScript, 0)
for _, script := range q.workspaceAgentScripts {
for _, id := range ids {
if script.WorkspaceAgentID == id {
scripts = append(scripts, script)
break
}
}
}
return scripts, nil
return q.getWorkspaceAgentScriptsByAgentIDsNoLock(ids)
}

func (q *FakeQuerier) GetWorkspaceAgentStats(_ context.Context, createdAfter time.Time) ([]database.GetWorkspaceAgentStatsRow, error) {
Expand Down
16 changes: 8 additions & 8 deletions coderd/workspacebuilds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {

// Tests will run in parallel. To avoid conflicts and race conditions on the
// build number, each test will have its own workspace and build.
makeBuild := func() database.WorkspaceBuild {
makeBuild := func(t *testing.T) database.WorkspaceBuild {
ws := dbgen.Workspace(t, db, database.WorkspaceTable{
OwnerID: user.ID,
OrganizationID: owner.OrganizationID,
Expand Down Expand Up @@ -1260,7 +1260,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with no timings
build := makeBuild()
build := makeBuild(t)

// When: fetching timings for the build
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
Expand All @@ -1277,7 +1277,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with provisioner timings
build := makeBuild()
build := makeBuild(t)
provisionerTimings := dbgen.ProvisionerJobTimings(t, db, build, 5)

// When: fetching timings for the build
Expand Down Expand Up @@ -1305,7 +1305,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with agent script timings
build := makeBuild()
build := makeBuild(t)
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: build.JobID,
})
Expand Down Expand Up @@ -1342,7 +1342,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with no agent scripts
build := makeBuild()
build := makeBuild(t)
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: build.JobID,
})
Expand All @@ -1365,7 +1365,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with no agents
build := makeBuild()
build := makeBuild(t)
dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: build.JobID,
})
Expand All @@ -1385,7 +1385,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with an agent
build := makeBuild()
build := makeBuild(t)
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: build.JobID,
})
Expand Down Expand Up @@ -1414,7 +1414,7 @@ func TestWorkspaceBuildTimings(t *testing.T) {
t.Parallel()

// Given: a build with multiple agents
build := makeBuild()
build := makeBuild(t)
resource := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{
JobID: build.JobID,
})
Expand Down
Loading