mirror of
https://github.com/containers/podman.git
synced 2025-07-25 09:05:00 +08:00
0f73935563
Also, do a general cleanup of all the timeout code. Changes include: - Convert from int to *uint where possible. Timeouts cannot be negative, hence the uint change; and a timeout of 0 is valid, so we need a new way to detect that the user set a timeout (hence, pointer). - Change name in the database to avoid conflicts between new data type and old one. This will cause timeouts set with 4.2.0 to be lost, but considering nobody is using the feature at present (and the lack of validation means we could have invalid, negative timeouts in the DB) this feels safe. - Ensure volume plugin timeouts can only be used with volumes created using a plugin. Timeouts on the local driver are nonsensical. - Remove the existing test, as it did not use a volume plugin. Write a new test that does. The actual plumbing of the containers.conf timeout in is one line in volume_api.go; the remainder are the above-described cleanups. Signed-off-by: Matthew Heon <mheon@redhat.com>
76 lines
1.9 KiB
Go
76 lines
1.9 KiB
Go
package libpod
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containers/podman/v4/libpod/define"
|
|
pluginapi "github.com/docker/go-plugins-helpers/volume"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// Inspect provides detailed information about the configuration of the given
|
|
// volume.
|
|
func (v *Volume) Inspect() (*define.InspectVolumeData, error) {
|
|
if !v.valid {
|
|
return nil, define.ErrVolumeRemoved
|
|
}
|
|
|
|
v.lock.Lock()
|
|
defer v.lock.Unlock()
|
|
|
|
if err := v.update(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
data := new(define.InspectVolumeData)
|
|
|
|
data.Mountpoint = v.config.MountPoint
|
|
if v.UsesVolumeDriver() {
|
|
logrus.Debugf("Querying volume plugin %s for status", v.config.Driver)
|
|
data.Mountpoint = v.state.MountPoint
|
|
|
|
if v.plugin == nil {
|
|
return nil, fmt.Errorf("volume %s uses volume plugin %s but it is not available, cannot inspect: %w", v.Name(), v.config.Driver, define.ErrMissingPlugin)
|
|
}
|
|
|
|
// Retrieve status for the volume.
|
|
// Need to query the volume driver.
|
|
req := new(pluginapi.GetRequest)
|
|
req.Name = v.Name()
|
|
resp, err := v.plugin.GetVolume(req)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error retrieving volume %s information from plugin %s: %w", v.Name(), v.Driver(), err)
|
|
}
|
|
if resp != nil {
|
|
data.Status = resp.Status
|
|
}
|
|
}
|
|
|
|
data.Name = v.config.Name
|
|
data.Driver = v.config.Driver
|
|
data.CreatedAt = v.config.CreatedTime
|
|
data.Labels = make(map[string]string)
|
|
for k, v := range v.config.Labels {
|
|
data.Labels[k] = v
|
|
}
|
|
data.Scope = v.Scope()
|
|
data.Options = make(map[string]string)
|
|
for k, v := range v.config.Options {
|
|
data.Options[k] = v
|
|
}
|
|
data.UID = v.uid()
|
|
data.GID = v.gid()
|
|
data.Anonymous = v.config.IsAnon
|
|
data.MountCount = v.state.MountCount
|
|
data.NeedsCopyUp = v.state.NeedsCopyUp
|
|
data.NeedsChown = v.state.NeedsChown
|
|
|
|
if v.config.Timeout != nil {
|
|
data.Timeout = *v.config.Timeout
|
|
} else if v.UsesVolumeDriver() {
|
|
data.Timeout = v.runtime.config.Engine.VolumePluginTimeout
|
|
}
|
|
|
|
return data, nil
|
|
}
|