mirror of
https://github.com/moby/buildkit.git
synced 2026-11-06 05:16:45 +00:00
Tonis Tiigi
8a2f77bc30
A request canceled while respondToIncoming was running could finish the last incoming request while outgoing work was still active, so a build returned before its exec completed. Decide on one snapshot of the cancel state per call. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package solver
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
// cancelOnRead cancels the request the first time the edge reads it, after
|
|
// respondToIncoming has started deciding on its incoming requests.
|
|
type cancelOnRead struct {
|
|
pipeSender
|
|
cancel func()
|
|
reads int
|
|
}
|
|
|
|
func (p *cancelOnRead) Request() pipeRequest {
|
|
r := p.pipeSender.Request()
|
|
p.reads++
|
|
if p.reads == 1 {
|
|
p.cancel()
|
|
}
|
|
return r
|
|
}
|
|
|
|
func TestCancelDuringRespondKeepsIncomingUntilOutgoingDrains(t *testing.T) {
|
|
p := newPipe(pipeRequest{Payload: &edgeRequest{desiredState: edgeStatusComplete}})
|
|
req := &cancelOnRead{pipeSender: p.Sender, cancel: p.Receiver.Cancel}
|
|
e := &edge{hasActiveOutgoing: true}
|
|
|
|
e.respondToIncoming([]pipeSender{req}, nil)
|
|
require.False(t, p.Sender.Status().Completed, "last incoming request completed with active outgoing")
|
|
|
|
// The next dispatch sees the cancel and asks outgoing work to drain.
|
|
_, done := e.respondToIncoming([]pipeSender{req}, nil)
|
|
require.True(t, done)
|
|
require.False(t, p.Sender.Status().Completed)
|
|
|
|
e.hasActiveOutgoing = false
|
|
e.respondToIncoming([]pipeSender{req}, nil)
|
|
require.True(t, p.Sender.Status().Completed)
|
|
}
|