diff options
author | Matthew Heon <mheon@redhat.com> | 2022-08-23 14:46:43 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2022-08-23 15:42:00 -0400 |
commit | 0f739355635d5bc4d538cf88009d7af533e7c289 (patch) | |
tree | 7dca8da84bb550c6b853b8f126b3248b8b6c58e7 /libpod/define/volume_inspect.go | |
parent | 3bcd8047cff076d34887bd3be7ed0e5701a41a02 (diff) | |
download | podman-0f739355635d5bc4d538cf88009d7af533e7c289.tar.gz podman-0f739355635d5bc4d538cf88009d7af533e7c289.tar.bz2 podman-0f739355635d5bc4d538cf88009d7af533e7c289.zip |
Add support for containers.conf volume timeouts
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>
Diffstat (limited to 'libpod/define/volume_inspect.go')
-rw-r--r-- | libpod/define/volume_inspect.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/define/volume_inspect.go b/libpod/define/volume_inspect.go index 9279812da..76120647c 100644 --- a/libpod/define/volume_inspect.go +++ b/libpod/define/volume_inspect.go @@ -57,7 +57,7 @@ type InspectVolumeData struct { // UID/GID. NeedsChown bool `json:"NeedsChown,omitempty"` // Timeout is the specified driver timeout if given - Timeout int `json:"Timeout,omitempty"` + Timeout uint `json:"Timeout,omitempty"` } type VolumeReload struct { |