Skip to content

feat: add lifecycle.Executor to manage autostart and autostop #1183

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 28 commits into from
May 11, 2022
Merged

feat: add lifecycle.Executor to manage autostart and autostop #1183

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a145d6d
feat: add lifecycle.Executor to autostart workspaces.
johnstcn Apr 19, 2022
8f401ca
refactor: do not expose Store in coderdtest.Options
johnstcn Apr 26, 2022
6d8f5fe
fixup! refactor: do not expose Store in coderdtest.Options
johnstcn Apr 26, 2022
cfd0d1e
stop accessing db directly, only query workspaces with autostart enabled
johnstcn Apr 26, 2022
ce63810
refactor unit tests, add tests for autostop
johnstcn Apr 26, 2022
579f362
make the new tests pass with some refactoring
johnstcn Apr 30, 2022
6e88f67
gitignore *.swp
johnstcn Apr 30, 2022
2b1a383
remove unused methods
johnstcn Apr 30, 2022
f31588e
fixup! remove unused methods
johnstcn Apr 30, 2022
80e0581
fix: range over channel, add continue to default switch case
johnstcn May 9, 2022
d176478
add test for deleted workspace
johnstcn May 9, 2022
bd97c1a
workspaces.sql: remove unused methods
johnstcn May 10, 2022
0931d25
unexport test helper methods
johnstcn May 10, 2022
faebe2e
chore: rename package autostart/lifecycle to lifecycle/executor
johnstcn May 10, 2022
abc0854
add test to ensure workspaces are not autostarted before time
johnstcn May 10, 2022
e53946a
wire up executor to coderd
johnstcn May 10, 2022
364a27c
fix: executor: skip workspaces whose last build was not successful
johnstcn May 10, 2022
e96414f
address PR comments
johnstcn May 11, 2022
b5bf50e
add goleak TestMain
johnstcn May 11, 2022
d37cc2b
fmt
johnstcn May 11, 2022
d11f5d7
mustTransitionWorkspace should return the updated workspace
johnstcn May 11, 2022
f6388b4
remove usage of require.Eventually/Never which is flaky on Windows
johnstcn May 11, 2022
fd0f8a3
make lifecycle executor spawn a new goroutine automatically
johnstcn May 11, 2022
7b6f2e1
rename unit tests
johnstcn May 11, 2022
a7143bd
s/doBuild/build
johnstcn May 11, 2022
7d9b696
rename parent package lifecycle to autobuild
johnstcn May 11, 2022
5cba737
add unit test for behaviour with an updated template
johnstcn May 11, 2022
7627372
add ticket to reference TODO
johnstcn May 11, 2022
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
Prev Previous commit
Next Next commit
unexport test helper methods
  • Loading branch information
@johnstcn
johnstcn committed May 10, 2022
commit 0931d258d8d2ce0cd88d66fade94814105c7a8a1
51 changes: 29 additions & 22 deletions coderd/autostart/lifecycle/lifecycle_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ func Test_Executor_Autostart_OK(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)
// Given: workspace is stopped
MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
mustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)

// Given: the workspace initially has autostart disabled
require.Empty(t, workspace.AutostartSchedule)
Expand All @@ -48,7 +48,7 @@ func Test_Executor_Autostart_OK(t *testing.T) {

// Then: the workspace should be started
require.Eventually(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.Job.Status == codersdk.ProvisionerJobSucceeded &&
ws.LatestBuild.Transition == database.WorkspaceTransitionStart
}, 5*time.Second, 250*time.Millisecond)
Expand All @@ -65,7 +65,7 @@ func Test_Executor_Autostart_AlreadyRunning(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)

// Given: we ensure the workspace is running
Expand All @@ -89,7 +89,7 @@ func Test_Executor_Autostart_AlreadyRunning(t *testing.T) {

// Then: the workspace should not be started.
require.Never(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.ID != workspace.LatestBuild.ID && ws.LatestBuild.Transition == database.WorkspaceTransitionStart
}, 5*time.Second, 250*time.Millisecond)
}
Expand All @@ -103,11 +103,11 @@ func Test_Executor_Autostart_NotEnabled(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)

// Given: workspace is stopped
MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
mustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)

// Given: the workspace has autostart disabled
require.Empty(t, workspace.AutostartSchedule)
Expand All @@ -120,7 +120,7 @@ func Test_Executor_Autostart_NotEnabled(t *testing.T) {

// Then: the workspace should not be started.
require.Never(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.ID != workspace.LatestBuild.ID && ws.LatestBuild.Transition == database.WorkspaceTransitionStart
}, 5*time.Second, 250*time.Millisecond)
}
Expand All @@ -136,7 +136,7 @@ func Test_Executor_Autostop_OK(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)
// Given: workspace is running
require.Equal(t, database.WorkspaceTransitionStart, workspace.LatestBuild.Transition)
Expand All @@ -159,7 +159,7 @@ func Test_Executor_Autostop_OK(t *testing.T) {

// Then: the workspace should be started
require.Eventually(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.ID != workspace.LatestBuild.ID && ws.LatestBuild.Transition == database.WorkspaceTransitionStop
}, 5*time.Second, 250*time.Millisecond)
}
Expand All @@ -174,11 +174,11 @@ func Test_Executor_Autostop_AlreadyStopped(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)

// Given: workspace is stopped
MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
mustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)

// Given: the workspace initially has autostart disabled
require.Empty(t, workspace.AutostopSchedule)
Expand All @@ -198,7 +198,7 @@ func Test_Executor_Autostop_AlreadyStopped(t *testing.T) {

// Then: the workspace should not be stopped.
require.Never(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.ID == workspace.LatestBuild.ID && ws.LatestBuild.Transition == database.WorkspaceTransitionStop
}, 5*time.Second, 250*time.Millisecond)
}
Expand All @@ -212,7 +212,7 @@ func Test_Executor_Autostop_NotEnabled(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)

// Given: workspace is running
Expand All @@ -229,7 +229,7 @@ func Test_Executor_Autostop_NotEnabled(t *testing.T) {

// Then: the workspace should not be stopped.
require.Never(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.ID == workspace.LatestBuild.ID && ws.LatestBuild.Transition == database.WorkspaceTransitionStop
}, 5*time.Second, 250*time.Millisecond)
}
Expand All @@ -245,7 +245,7 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {
LifecycleTicker: tickCh,
})
// Given: we have a user with a workspace
workspace = MustProvisionWorkspace(t, client)
workspace = mustProvisionWorkspace(t, client)
)

// Given: the workspace initially has autostart disabled
Expand All @@ -259,7 +259,7 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {
}))

// Given: workspace is deleted
MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionDelete)
mustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionDelete)

// When: the lifecycle executor ticks
go func() {
Expand All @@ -269,12 +269,12 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {

// Then: nothing should happen
require.Never(t, func() bool {
ws := coderdtest.MustWorkspace(t, client, workspace.ID)
ws := mustWorkspace(t, client, workspace.ID)
return ws.LatestBuild.Transition != database.WorkspaceTransitionDelete
}, 5*time.Second, 250*time.Millisecond)
}

func MustProvisionWorkspace(t *testing.T, client *codersdk.Client) codersdk.Workspace {
func mustProvisionWorkspace(t *testing.T, client *codersdk.Client) codersdk.Workspace {
t.Helper()
coderdtest.NewProvisionerDaemon(t, client)
user := coderdtest.CreateFirstUser(t, client)
Expand All @@ -283,10 +283,10 @@ func MustProvisionWorkspace(t *testing.T, client *codersdk.Client) codersdk.Work
coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
ws := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, ws.LatestBuild.ID)
return coderdtest.MustWorkspace(t, client, ws.ID)
return mustWorkspace(t, client, ws.ID)
}

func MustTransitionWorkspace(t *testing.T, client *codersdk.Client, workspaceID uuid.UUID, from, to database.WorkspaceTransition) {
func mustTransitionWorkspace(t *testing.T, client *codersdk.Client, workspaceID uuid.UUID, from, to database.WorkspaceTransition) {
t.Helper()
ctx := context.Background()
workspace, err := client.Workspace(ctx, workspaceID)
Expand All @@ -304,6 +304,13 @@ func MustTransitionWorkspace(t *testing.T, client *codersdk.Client, workspaceID

_ = coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)

updated := coderdtest.MustWorkspace(t, client, workspace.ID)
updated := mustWorkspace(t, client, workspace.ID)
require.Equal(t, to, updated.LatestBuild.Transition, "expected workspace to be in state %s but got %s", to, updated.LatestBuild.Transition)
}

func mustWorkspace(t *testing.T, client *codersdk.Client, workspaceID uuid.UUID) codersdk.Workspace {
ctx := context.Background()
ws, err := client.Workspace(ctx, workspaceID)
require.NoError(t, err, "no workspace found with id %s", workspaceID)
return ws
}
7 changes: 0 additions & 7 deletions coderd/coderdtest/coderdtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,3 @@ type roundTripper func(req *http.Request) (*http.Response, error)
func (r roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
return r(req)
}

func MustWorkspace(t *testing.T, client *codersdk.Client, workspaceID uuid.UUID) codersdk.Workspace {
ctx := context.Background()
ws, err := client.Workspace(ctx, workspaceID)
require.NoError(t, err, "no workspace found with id %s", workspaceID)
return ws
}