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

Commitcc25406

Browse files
committed
test agent reinitialization
1 parent18da76e commitcc25406

File tree

18 files changed

+123
-152
lines changed

18 files changed

+123
-152
lines changed

‎cli/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
413413
break
414414
}
415415

416-
logger.Info(ctx,"reinitializing...")
416+
logger.Info(ctx,"agentreinitializing")
417417
}
418418
returnlastErr
419419
},

‎cli/agent_test.go

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import (
2121
"github.com/coder/coder/v2/coderd/coderdtest"
2222
"github.com/coder/coder/v2/coderd/database"
2323
"github.com/coder/coder/v2/coderd/database/dbfake"
24+
"github.com/coder/coder/v2/coderd/database/dbtestutil"
2425
"github.com/coder/coder/v2/codersdk"
26+
"github.com/coder/coder/v2/codersdk/agentsdk"
2527
"github.com/coder/coder/v2/codersdk/workspacesdk"
2628
"github.com/coder/coder/v2/provisionersdk/proto"
2729
"github.com/coder/coder/v2/testutil"
@@ -321,6 +323,56 @@ func TestWorkspaceAgent(t *testing.T) {
321323
})
322324
}
323325

326+
funcTestAgent_Prebuild(t*testing.T) {
327+
t.Parallel()
328+
329+
db,pubsub:=dbtestutil.NewDB(t)
330+
client:=coderdtest.New(t,&coderdtest.Options{
331+
Database:db,
332+
Pubsub:pubsub,
333+
})
334+
user:=coderdtest.CreateFirstUser(t,client)
335+
r:=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
336+
OrganizationID:user.OrganizationID,
337+
OwnerID:user.UserID,
338+
}).WithAgent(func(a []*proto.Agent) []*proto.Agent {
339+
a[0].Scripts= []*proto.Script{
340+
{
341+
DisplayName:"Prebuild Test Script",
342+
Script:"sleep 5",// Make reinitiazation take long enough to assert that it happened
343+
RunOnStart:true,
344+
},
345+
}
346+
returna
347+
}).Do()
348+
349+
// Spin up an agent
350+
logDir:=t.TempDir()
351+
inv,_:=clitest.New(t,
352+
"agent",
353+
"--auth","token",
354+
"--agent-token",r.AgentToken,
355+
"--agent-url",client.URL.String(),
356+
"--log-dir",logDir,
357+
)
358+
clitest.Start(t,inv)
359+
360+
// Check that the agent is in a happy steady state
361+
waiter:=coderdtest.NewWorkspaceAgentWaiter(t,client,r.Workspace.ID)
362+
waiter.WaitFor(coderdtest.AgentReady)
363+
364+
// Trigger reinitialization
365+
channel:=agentsdk.PrebuildClaimedChannel(r.Workspace.ID)
366+
err:=pubsub.Publish(channel, []byte(user.UserID.String()))
367+
require.NoError(t,err)
368+
369+
// Check that the agent reinitializes
370+
waiter.WaitFor(coderdtest.AgentNotReady)
371+
372+
// Check that reinitialization completed
373+
waiter.WaitFor(coderdtest.AgentReady)
374+
}
375+
324376
funcmatchAgentWithVersion(rs []codersdk.WorkspaceResource)bool {
325377
iflen(rs)<1 {
326378
returnfalse

‎cli/testdata/coder_server_--help.golden

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -670,12 +670,6 @@ workspaces stopping during the day due to template scheduling.
670670
must be *. Only one hour and minute can be specified (ranges or comma
671671
separated values are not supported).
672672

673-
WORKSPACE PREBUILDS OPTIONS:
674-
Configure how workspace prebuilds behave.
675-
676-
--workspace-prebuilds-reconciliation-interval duration, $CODER_WORKSPACE_PREBUILDS_RECONCILIATION_INTERVAL (default: 15s)
677-
How often to reconcile workspace prebuilds state.
678-
679673
⚠️ DANGEROUS OPTIONS:
680674
--dangerous-allow-path-app-sharing bool, $CODER_DANGEROUS_ALLOW_PATH_APP_SHARING
681675
Allow workspace apps that are not served from subdomains to be shared.

‎cli/testdata/server-config.yaml.golden

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -688,15 +688,3 @@ notifications:
688688
# How often to query the database for queued notifications.
689689
# (default: 15s, type: duration)
690690
fetchInterval: 15s
691-
# Configure how workspace prebuilds behave.
692-
workspace_prebuilds:
693-
# How often to reconcile workspace prebuilds state.
694-
# (default: 15s, type: duration)
695-
reconciliation_interval: 15s
696-
# Interval to increase reconciliation backoff by when unrecoverable errors occur.
697-
# (default: 15s, type: duration)
698-
reconciliation_backoff_interval: 15s
699-
# Interval to look back to determine number of failed builds, which influences
700-
# backoff.
701-
# (default: 1h0m0s, type: duration)
702-
reconciliation_backoff_lookback_period: 1h0m0s

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 26 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 0 additions & 26 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/coderd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
"github.com/coder/coder/v2/coderd/entitlements"
4848
"github.com/coder/coder/v2/coderd/files"
4949
"github.com/coder/coder/v2/coderd/idpsync"
50-
"github.com/coder/coder/v2/coderd/prebuilds"
5150
"github.com/coder/coder/v2/coderd/runtimeconfig"
5251
"github.com/coder/coder/v2/coderd/webpush"
5352

‎coderd/coderdtest/coderdtest.go

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,59 @@ func (w WorkspaceAgentWaiter) MatchResources(m func([]codersdk.WorkspaceResource
11051105
returnw
11061106
}
11071107

1108+
typeWaitForCriteriumfunc(agent codersdk.WorkspaceAgent)bool
1109+
1110+
funcAgentReady(agent codersdk.WorkspaceAgent)bool {
1111+
returnagent.LifecycleState==codersdk.WorkspaceAgentLifecycleReady
1112+
}
1113+
1114+
funcAgentNotReady(agent codersdk.WorkspaceAgent)bool {
1115+
return!AgentReady(agent)
1116+
}
1117+
1118+
func (wWorkspaceAgentWaiter)WaitFor(criteria...WaitForCriterium) {
1119+
w.t.Helper()
1120+
1121+
agentNamesMap:=make(map[string]struct{},len(w.agentNames))
1122+
for_,name:=rangew.agentNames {
1123+
agentNamesMap[name]=struct{}{}
1124+
}
1125+
1126+
ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitLong)
1127+
defercancel()
1128+
1129+
w.t.Logf("waiting for workspace agents (workspace %s)",w.workspaceID)
1130+
require.Eventually(w.t,func()bool {
1131+
varerrerror
1132+
workspace,err:=w.client.Workspace(ctx,w.workspaceID)
1133+
iferr!=nil {
1134+
returnfalse
1135+
}
1136+
ifworkspace.LatestBuild.Job.CompletedAt==nil {
1137+
returnfalse
1138+
}
1139+
ifworkspace.LatestBuild.Job.CompletedAt.IsZero() {
1140+
returnfalse
1141+
}
1142+
1143+
for_,resource:=rangeworkspace.LatestBuild.Resources {
1144+
for_,agent:=rangeresource.Agents {
1145+
iflen(w.agentNames)>0 {
1146+
if_,ok:=agentNamesMap[agent.Name];!ok {
1147+
continue
1148+
}
1149+
}
1150+
for_,criterium:=rangecriteria {
1151+
if!criterium(agent) {
1152+
returnfalse
1153+
}
1154+
}
1155+
}
1156+
}
1157+
returntrue
1158+
},testutil.WaitLong,testutil.IntervalMedium)
1159+
}
1160+
11081161
// Wait waits for the agent(s) to connect and fails the test if they do not within testutil.WaitLong
11091162
func (wWorkspaceAgentWaiter)Wait() []codersdk.WorkspaceResource {
11101163
w.t.Helper()

‎coderd/workspaces.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,13 @@ func createWorkspace(
689689
api.Logger.Error(ctx,"failed to retrieve running agents of claimed prebuilt workspace",
690690
slog.F("workspace_id",claimedWorkspace.ID),slog.Error(err))
691691
}
692-
agentTokensByAgentID=make(map[uuid.UUID]string,len(agents))
693-
for_,agent:=rangeagents {
694-
agentTokensByAgentID[agent.ID]=agent.AuthToken.String()
692+
iflen(agents)>1 {
693+
returnxerrors.Errorf("multiple agents are not yet supported in prebuilt workspaces")
695694
}
695+
// agentTokensByAgentID = make(map[uuid.UUID]string, len(agents))
696+
// for _, agent := range agents {
697+
// agentTokensByAgentID[agent.ID] = agent.AuthToken.String()
698+
// }
696699
}
697700

698701
// We have to refetch the workspace for the joined in fields.

‎docs/reference/api/general.md

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp