containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganize uncompressedCounter 

Have it count the input to idLogger instead of uncompressedDigester;
they should get exactly the same data, but we are going to make
uncompressedDigester optional.

Also make the uncompressedDigester use a separate line so that we
can later change it more easily.

Should not change (observable) behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2021-08-20 19:36:36 +02:00
parent 0182717ec6
commit acd9a24f98
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layers.go
View File

@ -1541,7 +1541,6 @@ func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error
}
defer uncompressed.Close()
uncompressedDigester := digest.Canonical.Digester()
uncompressedCounter := ioutils.NewWriteCounter(uncompressedDigester.Hash())
uidLog := make(map[uint32]struct{})
gidLog := make(map[uint32]struct{})
idLogger, err := tarlog.NewLogger(func(h *tar.Header) {
@ -1554,7 +1553,10 @@ func (r *layerStore) ApplyDiff(to string, diff io.Reader) (size int64, err error
return -1, err
}
defer idLogger.Close()
payload, err := asm.NewInputTarStream(io.TeeReader(uncompressed, io.MultiWriter(uncompressedCounter, idLogger)), metadata, storage.NewDiscardFilePutter())
uncompressedCounter := ioutils.NewWriteCounter(idLogger)
uncompressedWriter := (io.Writer)(uncompressedCounter)
uncompressedWriter = io.MultiWriter(uncompressedWriter, uncompressedDigester.Hash())
payload, err := asm.NewInputTarStream(io.TeeReader(uncompressed, uncompressedWriter), metadata, storage.NewDiscardFilePutter())
if err != nil {
return -1, err
}