diff --git a/e2e/tests/ssh/detached_validation.go b/e2e/tests/ssh/detached_validation.go index 8a58d628b..c5f93603b 100644 --- a/e2e/tests/ssh/detached_validation.go +++ b/e2e/tests/ssh/detached_validation.go @@ -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) }, diff --git a/pkg/task/launch.go b/pkg/task/launch.go index cb7d6892e..75282c343 100644 --- a/pkg/task/launch.go +++ b/pkg/task/launch.go @@ -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 diff --git a/pkg/task/launch_test.go b/pkg/task/launch_test.go index 026f4d253..6838fb58f 100644 --- a/pkg/task/launch_test.go +++ b/pkg/task/launch_test.go @@ -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{}) diff --git a/pkg/task/store.go b/pkg/task/store.go index 2d67b5562..6d81a674a 100644 --- a/pkg/task/store.go +++ b/pkg/task/store.go @@ -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) })