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

Commit26f5001

Browse files
committed
use the runOnce time
Signed-off-by: Callum Styan <callumstyan@gmail.com>
1 parent1256877 commit26f5001

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

‎coderd/autobuild/lifecycle_executor.go‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"strings"
1010
"sync"
1111
"sync/atomic"
12-
"testing"
1312
"time"
1413

1514
"github.com/dustin/go-humanize"
@@ -138,17 +137,11 @@ func (e *Executor) Run() {
138137
}()
139138
}
140139

141-
func (e*Executor)hasAvailableProvisioners(ctx context.Context,tx database.Store,ws database.Workspace,templateVersionJob database.ProvisionerJob) (bool,error) {
140+
func (e*Executor)hasAvailableProvisioners(ctx context.Context,tx database.Store,t time.Time,ws database.Workspace,templateVersionJob database.ProvisionerJob) (bool,error) {
142141
ife.SkipProvisionerCheck {
143142
returntrue,nil
144143
}
145144

146-
// Use a shorter stale interval for tests
147-
staleInterval:=provisionerdserver.StaleInterval
148-
iftesting.Testing() {
149-
staleInterval=TestingStaleInterval
150-
}
151-
152145
// Get eligible provisioner daemons for this workspace's template
153146
provisionerDaemons,err:=tx.GetProvisionerDaemonsByOrganization(ctx, database.GetProvisionerDaemonsByOrganizationParams{
154147
OrganizationID:ws.OrganizationID,
@@ -159,11 +152,10 @@ func (e *Executor) hasAvailableProvisioners(ctx context.Context, tx database.Sto
159152
}
160153

161154
// Check if any provisioners are active (not stale)
162-
now:=dbtime.Now()
163155
for_,pd:=rangeprovisionerDaemons {
164156
ifpd.LastSeenAt.Valid {
165-
age:=now.Sub(pd.LastSeenAt.Time)
166-
ifage<=staleInterval {
157+
age:=t.Sub(pd.LastSeenAt.Time)
158+
ifage<=provisionerdserver.StaleInterval {
167159
returntrue,nil
168160
}
169161
}
@@ -327,7 +319,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
327319
}
328320

329321
// Before creating the workspace build, check for available provisioners
330-
hasProvisioners,err:=e.hasAvailableProvisioners(e.ctx,tx,ws,templateVersionJob)
322+
hasProvisioners,err:=e.hasAvailableProvisioners(e.ctx,tx,t,ws,templateVersionJob)
331323
iferr!=nil {
332324
returnxerrors.Errorf("check provisioner availability: %w",err)
333325
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp