forked from docker/buildx
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: allow builds from stdin for multi-node builders
When building from same stream all nodes need to read data from the same stream. In order to achive that there is a new SyncMultiReader wrapper that sends the stream concurrently to all readers. Readers must read at similar speed or pauses will happen while they wait for each other. Dockerfiles were already written to disk before sent. Now the file written by first node is reused for others. Signed-off-by: Tonis Tiigi <[email protected]>
- Loading branch information
1 parent
e00efeb
commit adbcc22
Showing
5 changed files
with
266 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| package build | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "bytes" | ||
| "io" | ||
| "sync" | ||
| ) | ||
|
|
||
| type SyncMultiReader struct { | ||
| source *bufio.Reader | ||
| buffer []byte | ||
| static []byte | ||
| mu sync.Mutex | ||
| cond *sync.Cond | ||
| readers []*syncReader | ||
| err error | ||
| offset int | ||
| } | ||
|
|
||
| type syncReader struct { | ||
| mr *SyncMultiReader | ||
| offset int | ||
| closed bool | ||
| } | ||
|
|
||
| func NewSyncMultiReader(source io.Reader) *SyncMultiReader { | ||
| mr := &SyncMultiReader{ | ||
| source: bufio.NewReader(source), | ||
| buffer: make([]byte, 0, 32*1024), | ||
| } | ||
| mr.cond = sync.NewCond(&mr.mu) | ||
| return mr | ||
| } | ||
|
|
||
| func (mr *SyncMultiReader) Peek(n int) ([]byte, error) { | ||
| mr.mu.Lock() | ||
| defer mr.mu.Unlock() | ||
|
|
||
| if mr.static != nil { | ||
| return mr.static[min(n, len(mr.static)):], nil | ||
| } | ||
|
|
||
| return mr.source.Peek(n) | ||
| } | ||
|
|
||
| func (mr *SyncMultiReader) Reset(dt []byte) { | ||
| mr.mu.Lock() | ||
| defer mr.mu.Unlock() | ||
|
|
||
| mr.static = dt | ||
| } | ||
|
|
||
| func (mr *SyncMultiReader) NewReadCloser() io.ReadCloser { | ||
| mr.mu.Lock() | ||
| defer mr.mu.Unlock() | ||
|
|
||
| if mr.static != nil { | ||
| return io.NopCloser(bytes.NewReader(mr.static)) | ||
| } | ||
|
|
||
| reader := &syncReader{ | ||
| mr: mr, | ||
| } | ||
| mr.readers = append(mr.readers, reader) | ||
| return reader | ||
| } | ||
|
|
||
| func (sr *syncReader) Read(p []byte) (int, error) { | ||
| sr.mr.mu.Lock() | ||
| defer sr.mr.mu.Unlock() | ||
|
|
||
| return sr.read(p) | ||
| } | ||
|
|
||
| func (sr *syncReader) read(p []byte) (int, error) { | ||
| end := sr.mr.offset + len(sr.mr.buffer) | ||
|
|
||
| loop0: | ||
| for { | ||
| if sr.closed { | ||
| return 0, io.EOF | ||
| } | ||
|
|
||
| end := sr.mr.offset + len(sr.mr.buffer) | ||
|
|
||
| if sr.mr.err != nil && sr.offset == end { | ||
| return 0, sr.mr.err | ||
| } | ||
|
|
||
| start := sr.offset - sr.mr.offset | ||
|
|
||
| dt := sr.mr.buffer[start:] | ||
|
|
||
| if len(dt) > 0 { | ||
| n := copy(p, dt) | ||
| sr.offset += n | ||
| sr.mr.cond.Broadcast() | ||
| return n, nil | ||
| } | ||
|
|
||
| // check for readers that have not caught up | ||
| hasOpen := false | ||
| for _, r := range sr.mr.readers { | ||
| if !r.closed { | ||
| hasOpen = true | ||
| } else { | ||
| continue | ||
| } | ||
| if r.offset < end { | ||
| sr.mr.cond.Wait() | ||
| continue loop0 | ||
| } | ||
| } | ||
|
|
||
| if !hasOpen { | ||
| return 0, io.EOF | ||
| } | ||
| break | ||
| } | ||
|
|
||
| last := sr.mr.offset + len(sr.mr.buffer) | ||
| // another reader has already updated the buffer | ||
| if last > end || sr.mr.err != nil { | ||
| return sr.read(p) | ||
| } | ||
|
|
||
| sr.mr.offset += len(sr.mr.buffer) | ||
|
|
||
| sr.mr.buffer = sr.mr.buffer[:cap(sr.mr.buffer)] | ||
| n, err := sr.mr.source.Read(sr.mr.buffer) | ||
| if n >= 0 { | ||
| sr.mr.buffer = sr.mr.buffer[:n] | ||
| } else { | ||
| sr.mr.buffer = sr.mr.buffer[:0] | ||
| } | ||
|
|
||
| sr.mr.cond.Broadcast() | ||
|
|
||
| if err != nil { | ||
| sr.mr.err = err | ||
| return 0, err | ||
| } | ||
|
|
||
| nn := copy(p, sr.mr.buffer) | ||
| sr.offset += nn | ||
|
|
||
| return nn, nil | ||
| } | ||
|
|
||
| func (sr *syncReader) Close() error { | ||
| sr.mr.mu.Lock() | ||
| defer sr.mr.mu.Unlock() | ||
|
|
||
| if sr.closed { | ||
| return nil | ||
| } | ||
|
|
||
| sr.closed = true | ||
|
|
||
| sr.mr.cond.Broadcast() | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package build | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "crypto/rand" | ||
| "io" | ||
| mathrand "math/rand" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func generateRandomData(size int) []byte { | ||
| data := make([]byte, size) | ||
| rand.Read(data) | ||
| return data | ||
| } | ||
| func TestSyncMultiReaderParallel(t *testing.T) { | ||
| data := generateRandomData(1024 * 1024) | ||
| source := bytes.NewReader(data) | ||
| mr := NewSyncMultiReader(source) | ||
|
|
||
| var wg sync.WaitGroup | ||
| numReaders := 10 | ||
| bufferSize := 4096 * 4 | ||
|
|
||
| readers := make([]io.ReadCloser, numReaders) | ||
|
|
||
| for i := 0; i < numReaders; i++ { | ||
| readers[i] = mr.NewReadCloser() | ||
| } | ||
|
|
||
| for i := 0; i < numReaders; i++ { | ||
| wg.Add(1) | ||
| go func(readerId int) { | ||
| defer wg.Done() | ||
| reader := readers[readerId] | ||
| defer reader.Close() | ||
|
|
||
| totalRead := 0 | ||
| buf := make([]byte, bufferSize) | ||
| for totalRead < len(data) { | ||
| // Simulate random read sizes | ||
| readSize := mathrand.Intn(bufferSize) //nolint:gosec | ||
| n, err := reader.Read(buf[:readSize]) | ||
|
|
||
| if n > 0 { | ||
| assert.Equal(t, data[totalRead:totalRead+n], buf[:n], "Reader %d mismatch", readerId) | ||
| totalRead += n | ||
| } | ||
|
|
||
| if err == io.EOF { | ||
| assert.Equal(t, len(data), totalRead, "Reader %d EOF mismatch", readerId) | ||
| return | ||
| } | ||
|
|
||
| require.NoError(t, err, "Reader %d error", readerId) | ||
|
|
||
| if mathrand.Intn(1000) == 0 { //nolint:gosec | ||
| t.Logf("Reader %d closing", readerId) | ||
| // Simulate random close | ||
| return | ||
| } | ||
|
|
||
| // Simulate random timing between reads | ||
| time.Sleep(time.Millisecond * time.Duration(mathrand.Intn(5))) //nolint:gosec | ||
| } | ||
|
|
||
| assert.Equal(t, len(data), totalRead, "Reader %d total read mismatch", readerId) | ||
| }(i) | ||
| } | ||
|
|
||
| wg.Wait() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters