mirror of
https://github.com/containers/podman.git
synced 2025-09-29 01:35:06 +08:00
34235b2726
Fix two bugs in `system df`:
1. The total size was calculated incorrectly as it was creating the sum
of all image sizes but did not consider that a) the same image may
be listed more than once (i.e., for each repo-tag pair), and that
b) images share layers.
The total size is now calculated directly in `libimage` by taking
multi-layer use into account.
2. The reclaimable size was calculated incorrectly. This number
indicates which data we can actually remove which means the total
size minus what containers use (i.e., the "unique" size of the image
in use by containers).
NOTE: The c/storage version is pinned back to the previous commit as it
is buggy. c/common already requires the buggy version, so use a
`replace` to force/pin.
Fixes: #16135
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
67 lines
1.6 KiB
Go
67 lines
1.6 KiB
Go
package hooks
|
|
|
|
import (
|
|
"context"
|
|
|
|
current "github.com/containers/common/pkg/hooks/1.0.0"
|
|
"github.com/fsnotify/fsnotify"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// Monitor dynamically monitors hook directories for additions,
|
|
// updates, and removals.
|
|
//
|
|
// This function writes two empty structs to the sync channel: the
|
|
// first is written after the watchers are established and the second
|
|
// when this function exits. The expected usage is:
|
|
//
|
|
// ctx, cancel := context.WithCancel(context.Background())
|
|
// sync := make(chan error, 2)
|
|
// go m.Monitor(ctx, sync)
|
|
// err := <-sync // block until writers are established
|
|
// if err != nil {
|
|
// return err // failed to establish watchers
|
|
// }
|
|
// // do stuff
|
|
// cancel()
|
|
// err = <-sync // block until monitor finishes
|
|
func (m *Manager) Monitor(ctx context.Context, sync chan<- error) {
|
|
watcher, err := fsnotify.NewWatcher()
|
|
if err != nil {
|
|
sync <- err
|
|
return
|
|
}
|
|
defer watcher.Close()
|
|
|
|
for _, dir := range m.directories {
|
|
err = watcher.Add(dir)
|
|
if err != nil {
|
|
logrus.Errorf("Failed to watch %q for hooks", dir)
|
|
sync <- err
|
|
return
|
|
}
|
|
logrus.Debugf("monitoring %q for hooks", dir)
|
|
}
|
|
|
|
sync <- nil
|
|
|
|
for {
|
|
select {
|
|
case event := <-watcher.Events:
|
|
m.hooks = make(map[string]*current.Hook)
|
|
for _, dir := range m.directories {
|
|
err = ReadDir(dir, m.extensionStages, m.hooks)
|
|
if err != nil {
|
|
logrus.Errorf("Failed loading hooks for %s: %v", event.Name, err)
|
|
}
|
|
}
|
|
case <-ctx.Done():
|
|
err = ctx.Err()
|
|
logrus.Debugf("hook monitoring canceled: %v", err)
|
|
sync <- err
|
|
close(sync)
|
|
return
|
|
}
|
|
}
|
|
}
|