Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion e2e/tests/ssh/detached_validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func (cli detachedValidationCLI) launchWorker(
if err := tk.PublishProcess(started); err != nil {
return err
}
commitCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
commitCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
return tk.CommitLaunch(commitCtx)
},
Expand Down
7 changes: 4 additions & 3 deletions pkg/task/launch.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,17 @@ func (s *State) markLaunchCleanupPending() {

func (t *Task) commitLaunchStep() (bool, error) {
committed, rejected := false, false
err := t.store.update(t.id, func(s *State) {
err := t.store.updateIf(t.id, func(s *State) bool {
if !s.acceptsLaunch() || s.Process == nil {
rejected = true
return
return false
}
if !s.WorkerReady {
return
return false
}
s.LaunchPending = false
committed = true
return true
})
if err != nil {
return false, err
Expand Down
27 changes: 27 additions & 0 deletions pkg/task/launch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,33 @@ func TestLaunchCommitRequiresReadinessAndPreservesCancellation(t *testing.T) {
require.True(t, state.ProcessCleanupComplete)
}

func TestLaunchCommitPollDoesNotRewriteStateWhileWorkerIsNotReady(t *testing.T) {
store := newTestStore(t)
tk, err := store.CreateLaunch(CreateOptions{})
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, releaseLauncherLock(tk)) })
identity, err := command.ProcessTreeIdentity(os.Getpid())
require.NoError(t, err)
require.NoError(t, tk.PublishProcess(command.ProcessRef{PID: os.Getpid(), Identity: identity}))
before, err := store.Get(tk.ID())
require.NoError(t, err)

for range 5 {
committed, err := tk.commitLaunchStep()
require.NoError(t, err)
require.False(t, committed)
}

after, err := store.Get(tk.ID())
require.NoError(t, err)
require.True(t, before.UpdatedAt.Equal(after.UpdatedAt))

require.NoError(t, tk.WorkerLaunchReady(os.Getpid()))
committed, err := tk.commitLaunchStep()
require.NoError(t, err)
require.True(t, committed)
}

func TestLegacyPendingLaunchCannotClaimCleanup(t *testing.T) {
store := newTestStore(t)
tk, err := store.Create(CreateOptions{})
Expand Down
11 changes: 10 additions & 1 deletion pkg/task/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -614,12 +614,21 @@ func (s *Store) launcherLockPath(id string) (string, error) {
}

func (s *Store) update(id string, mutate func(*State)) error {
return s.updateIf(id, func(state *State) bool {
mutate(state)
return true
})
}

func (s *Store) updateIf(id string, mutate func(*State) bool) error {
return s.withLock(id, func() error {
state, err := s.readState(id)
if err != nil {
return err
}
mutate(state)
if !mutate(state) {
return nil
}
state.touch()
return s.write(state)
})
Expand Down
Loading