Skip to content

Commit

Permalink
cluster: use WaitConditionNextExit
Browse files Browse the repository at this point in the history
There is a chance that this will address an issue that causes spurious
failures on CI, where it looks like we're janking the file system out
from under a running process. For context, see:

#58955

Release note: None
  • Loading branch information
tbg committed Feb 19, 2021
1 parent 83e70ce commit 6543749
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/acceptance/cluster/dockercluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func (l *DockerCluster) OneShot(
if err := l.oneshot.Start(ctx); err != nil {
return err
}
return l.oneshot.Wait(ctx, container.WaitConditionNotRunning)
return l.oneshot.Wait(ctx, container.WaitConditionNextExit)
}

// stopOnPanic is invoked as a deferred function in Start in order to attempt
Expand Down Expand Up @@ -377,7 +377,7 @@ func (l *DockerCluster) initCluster(ctx context.Context) {
// and it'll get in the way of future runs.
l.vols = c
maybePanic(c.Start(ctx))
maybePanic(c.Wait(ctx, container.WaitConditionNotRunning))
maybePanic(c.Wait(ctx, container.WaitConditionNextExit))
}

// cockroachEntryPoint returns the value to be used as
Expand Down

0 comments on commit 6543749

Please sign in to comment.