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

The cidfile should be created when the container is created #8094

Merged
merged 1 commit into from
Oct 27, 2020

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Oct 21, 2020

Currently if you run an interactive session of podman run and
specifiy the --cidfile option, the cidfile will not get created
until the container finishes running. If you run a detached
container, it will get created right away. This Patch creates
the cidfile as soon as the container is created. This could allow
other tools to use the cidefile on all running containers.

Fixes: #8091

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 21, 2020

func OpenCidFile(cidfile string) (*os.File, error) {
if cidfile == "" {
return nil, nil
Copy link
Collaborator

Choose a reason for hiding this comment

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

may be need to new an error when cidfile==""?

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed check, and just let it fall through to get error at next level.

@mheon
Copy link
Member

mheon commented Oct 21, 2020 via email

@rhatdan
Copy link
Member Author

rhatdan commented Oct 21, 2020

@mheon I did remove the existing code, from run.go. This was working but only on exit. So podman run -d ... would work the way you expect. The issue was podman run -ti ... would only create the cidfile when you exited from the container.

@rhatdan
Copy link
Member Author

rhatdan commented Oct 21, 2020

@mheon Sorry you were right, some of my changes did not make it into the original PR.

@TomSweeneyRedHat
Copy link
Member

A bunch of red marks on the tests @rhatdan

if _, err = cidFile.WriteString(id); err != nil {
logrus.Error(err)
}
cidFile.Sync()
Copy link
Member

Choose a reason for hiding this comment

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

the Sync() is not needed here. If the node crashes the PID is not valid on the next boot anyway

@mheon
Copy link
Member

mheon commented Oct 21, 2020

LGTM once tests start passing and comment from @giuseppe is addressed.

@rhatdan rhatdan force-pushed the cidfile branch 2 times, most recently from 34bc9ab to 4f8e514 Compare October 22, 2020 09:39
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 23, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 23, 2020
Currently if you run an interactive session of podman run and
specifiy the --cidfile option, the cidfile will not get created
until the container finishes running.  If you run a detached
container, it will get created right away.  This Patch creates
the cidfile as soon as the container is created.  This could allow
other tools to use the cidefile on all running containers.

Signed-off-by: Daniel J Walsh <[email protected]>
Copy link
Member

@giuseppe giuseppe 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-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

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 rhatdan added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2020
@openshift-merge-robot openshift-merge-robot merged commit 5c08495 into containers:master Oct 27, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman run --cidfile without --detach only writes the id after completion
7 participants