Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: use NoLock dbmem subqueries forGetWorkspaceAgentScriptTimingsByBuildID#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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ethanndickson merged 1 commit intomainfromethan/fix-timings-flake
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
32 changes: 18 additions & 14 deletionscoderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line numberDiff line numberDiff 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:=rangeq.workspaceAgentScripts {
for_,id:=rangeids {
ifscript.WorkspaceAgentID==id {
scripts=append(scripts,script)
break
}
}
}
returnscripts,nil
}

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

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

resources,err:=q.GetWorkspaceResourcesByJobID(ctx,build.JobID)
resources,err:=q.getWorkspaceResourcesByJobIDNoLock(ctx,build.JobID)
iferr!=nil {
returnnil,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)
iferr!=nil {
returnnil,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)
iferr!=nil {
returnnil,xerrors.Errorf("get scripts: %w",err)
}
Expand DownExpand Up@@ -5933,16 +5946,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptsByAgentIDs(_ context.Context, ids
q.mutex.RLock()
deferq.mutex.RUnlock()

scripts:=make([]database.WorkspaceAgentScript,0)
for_,script:=rangeq.workspaceAgentScripts {
for_,id:=rangeids {
ifscript.WorkspaceAgentID==id {
scripts=append(scripts,script)
break
}
}
}
returnscripts,nil
returnq.getWorkspaceAgentScriptsByAgentIDsNoLock(ids)
}

func (q*FakeQuerier)GetWorkspaceAgentStats(_ context.Context,createdAfter time.Time) ([]database.GetWorkspaceAgentStatsRow,error) {
Expand Down
16 changes: 8 additions & 8 deletionscoderd/workspacebuilds_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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
[8]ページ先頭
©2009-2025 Movatter.jp