572ce80230
This commit adds a transfer manager which deduplicates and schedules transfers, and also an upload manager and download manager that build on top of the transfer manager to provide high-level interfaces for uploads and downloads. The push and pull code is modified to use these building blocks. Some benefits of the changes: - Simplification of push/pull code - Pushes can upload layers concurrently - Failed downloads and uploads are retried after backoff delays - Cancellation is supported, but individual transfers will only be cancelled if all pushes or pulls using them are cancelled. - The distribution code is decoupled from Docker Engine packages and API conventions (i.e. streamformatter), which will make it easier to split out. This commit also includes unit tests for the new distribution/xfer package. The tests cover 87.8% of the statements in the package. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
59 lines
1.4 KiB
Go
59 lines
1.4 KiB
Go
package progress
|
|
|
|
import (
|
|
"io"
|
|
)
|
|
|
|
// Reader is a Reader with progress bar.
|
|
type Reader struct {
|
|
in io.ReadCloser // Stream to read from
|
|
out Output // Where to send progress bar to
|
|
size int64
|
|
current int64
|
|
lastUpdate int64
|
|
id string
|
|
action string
|
|
}
|
|
|
|
// NewProgressReader creates a new ProgressReader.
|
|
func NewProgressReader(in io.ReadCloser, out Output, size int64, id, action string) *Reader {
|
|
return &Reader{
|
|
in: in,
|
|
out: out,
|
|
size: size,
|
|
id: id,
|
|
action: action,
|
|
}
|
|
}
|
|
|
|
func (p *Reader) Read(buf []byte) (n int, err error) {
|
|
read, err := p.in.Read(buf)
|
|
p.current += int64(read)
|
|
updateEvery := int64(1024 * 512) //512kB
|
|
if p.size > 0 {
|
|
// Update progress for every 1% read if 1% < 512kB
|
|
if increment := int64(0.01 * float64(p.size)); increment < updateEvery {
|
|
updateEvery = increment
|
|
}
|
|
}
|
|
if p.current-p.lastUpdate > updateEvery || err != nil {
|
|
p.updateProgress(err != nil && read == 0)
|
|
p.lastUpdate = p.current
|
|
}
|
|
|
|
return read, err
|
|
}
|
|
|
|
// Close closes the progress reader and its underlying reader.
|
|
func (p *Reader) Close() error {
|
|
if p.current < p.size {
|
|
// print a full progress bar when closing prematurely
|
|
p.current = p.size
|
|
p.updateProgress(false)
|
|
}
|
|
return p.in.Close()
|
|
}
|
|
|
|
func (p *Reader) updateProgress(last bool) {
|
|
p.out.WriteProgress(Progress{ID: p.id, Action: p.action, Current: p.current, Total: p.size, LastUpdate: last})
|
|
}
|