mirror of
https://github.com/containers/podman.git
synced 2025-12-11 09:18:34 +08:00
vendor: update containers/storage
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
27
vendor/github.com/containers/storage/pkg/chunked/cache_linux.go
generated
vendored
27
vendor/github.com/containers/storage/pkg/chunked/cache_linux.go
generated
vendored
@@ -65,11 +65,10 @@ type layer struct {
|
||||
}
|
||||
|
||||
type layersCache struct {
|
||||
layers []*layer
|
||||
refs int
|
||||
store storage.Store
|
||||
mutex sync.RWMutex
|
||||
created time.Time
|
||||
layers []*layer
|
||||
refs int
|
||||
store storage.Store
|
||||
mutex sync.RWMutex
|
||||
}
|
||||
|
||||
var (
|
||||
@@ -83,6 +82,7 @@ func (c *layer) release() {
|
||||
if err := unix.Munmap(c.mmapBuffer); err != nil {
|
||||
logrus.Warnf("Error Munmap: layer %q: %v", c.id, err)
|
||||
}
|
||||
c.mmapBuffer = nil
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,14 +107,13 @@ func (c *layersCache) release() {
|
||||
func getLayersCacheRef(store storage.Store) *layersCache {
|
||||
cacheMutex.Lock()
|
||||
defer cacheMutex.Unlock()
|
||||
if cache != nil && cache.store == store && time.Since(cache.created).Minutes() < 10 {
|
||||
if cache != nil && cache.store == store {
|
||||
cache.refs++
|
||||
return cache
|
||||
}
|
||||
cache := &layersCache{
|
||||
store: store,
|
||||
refs: 1,
|
||||
created: time.Now(),
|
||||
cache = &layersCache{
|
||||
store: store,
|
||||
refs: 1,
|
||||
}
|
||||
return cache
|
||||
}
|
||||
@@ -291,7 +290,7 @@ func (c *layersCache) load() error {
|
||||
if r.ReadOnly {
|
||||
// If the layer is coming from a read-only store, do not attempt
|
||||
// to write to it.
|
||||
// Therefore,we won’t find any matches in read-only-store layers,
|
||||
// Therefore, we won’t find any matches in read-only-store layers,
|
||||
// unless the read-only store layer comes prepopulated with cacheKey data.
|
||||
continue
|
||||
}
|
||||
@@ -781,14 +780,14 @@ func (c *layersCache) findDigestInternal(digest string) (string, string, int64,
|
||||
return "", "", -1, nil
|
||||
}
|
||||
|
||||
c.mutex.RLock()
|
||||
defer c.mutex.RUnlock()
|
||||
|
||||
binaryDigest, err := makeBinaryDigest(digest)
|
||||
if err != nil {
|
||||
return "", "", 0, err
|
||||
}
|
||||
|
||||
c.mutex.RLock()
|
||||
defer c.mutex.RUnlock()
|
||||
|
||||
for _, layer := range c.layers {
|
||||
if !layer.cacheFile.bloomFilter.maybeContains(binaryDigest) {
|
||||
continue
|
||||
|
||||
2
vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
generated
vendored
2
vendor/github.com/containers/storage/pkg/chunked/storage_linux.go
generated
vendored
@@ -1331,7 +1331,7 @@ func (c *chunkedDiffer) ApplyDiff(dest string, options *archive.TarOptions, diff
|
||||
wg.Wait()
|
||||
}()
|
||||
|
||||
for i := 0; i < copyGoRoutines; i++ {
|
||||
for range copyGoRoutines {
|
||||
wg.Add(1)
|
||||
jobs := copyFileJobs
|
||||
|
||||
|
||||
Reference in New Issue
Block a user