Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add volume plugin timeout to containers.conf #1129

Merged
merged 1 commit into from
Aug 22, 2022

Conversation

mheon
Copy link
Member

@mheon mheon commented Aug 22, 2022

Add a new config knob for setting a default timeout for volume plugins. Just adds a field to containers.conf, real work will be in Libpod to wire it in.

@mheon
Copy link
Member Author

mheon commented Aug 22, 2022

@containers/podman-maintainers PTAL

@@ -168,6 +168,8 @@ const (
SeccompOverridePath = _etcDir + "/containers/seccomp.json"
// SeccompDefaultPath defines the default seccomp path.
SeccompDefaultPath = _installPrefix + "/share/containers/seccomp.json"
// DefaultVolumePluginTimeout is the default volume plugin timeout, in milliseconds.
DefaultVolumePluginTimeout = 5000
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not make this Human? I don't know Microseconds, but I do know 5s

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think people might want to do sub-1s timeouts (250/500 milliseconds seems reasonable) and I didn't want to make this a float. Probably not a big deal to do seconds instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does 250ms work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to just do seconds... Thinking about it more, it shouldn't really matter that much.

@mheon mheon force-pushed the add_volume_timeout branch from 1960b1d to 355e985 Compare August 22, 2022 17:57
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
@mheon mheon force-pushed the add_volume_timeout branch from 355e985 to a74cc41 Compare August 22, 2022 18:39
@mheon
Copy link
Member Author

mheon commented Aug 22, 2022

Tests should be going green

@rhatdan
Copy link
Member

rhatdan commented Aug 22, 2022

LGTM
@containers/podman-maintainers PTAL

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, mheon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@rhatdan
Copy link
Member

rhatdan commented Aug 22, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Aug 22, 2022
@openshift-merge-robot openshift-merge-robot merged commit 83cb8f7 into containers:main Aug 22, 2022
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I miss tests. One checking for the default timer and another for checking a custom value.

@mheon, could you add them in another PR? Just to be extra sure.

@mheon mheon mentioned this pull request Oct 6, 2022
openshift-merge-robot added a commit that referenced this pull request Oct 6, 2022
openshift-merge-robot added a commit that referenced this pull request Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants