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

Create volume path before state initialization #23524

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

mheon
Copy link
Member

@mheon mheon commented Aug 6, 2024

Strictly speaking we don't need the path yet, but it existing prevents a lot of strangeness in our path-checking logic to validate the current Podman configuration, as it was the only path that might not exist this early in init.

Fixes #23515

Does this PR introduce a user-facing change?

Fixed a bug where rootless Podman could fail to validate the runtime's volume path on systems with a symlinked `/home` ([#23515](/~https://github.com/containers/podman/issues/23515)).

Strictly speaking we don't need the path yet, but it existing
prevents a lot of strangeness in our path-checking logic to
validate the current Podman configuration, as it was the only
path that might not exist this early in init.

Fixes containers#23515

Signed-off-by: Matt Heon <mheon@redhat.com>
@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 6, 2024
@rhatdan
Copy link
Member

rhatdan commented Aug 6, 2024

LGTM

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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2024
Copy link
Contributor

openshift-ci bot commented Aug 7, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, 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

@openshift-merge-bot openshift-merge-bot bot merged commit 9e8c4c4 into containers:main Aug 7, 2024
82 of 83 checks passed
Comment on lines +197 to +203
# Remove volume directory. This doesn't break Podman but can cause our DB
# validation to break if Podman misbehaves. Ref:
# /~https://github.com/containers/podman/issues/23515
# (Unfortunately, we can't just use a new directory, that will just trip DB
# validation that it doesn't match the path we were using before)
rm -rf $PODMAN_TMPDIR/$HOME/.local/share/containers/storage/volumes

Copy link
Member

Choose a reason for hiding this comment

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

Did you actually test this with an older podman binary? This test always passes without your patch for me locally so this is a NOP I think.

@mheon
Copy link
Member Author

mheon commented Aug 16, 2024

Before I forget again
/cherry-pick v5.2

@openshift-cherrypick-robot
Copy link
Collaborator

@mheon: new pull request created: #23647

In response to this:

Before I forget again
/cherry-pick v5.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@debarshiray
Copy link
Member

Thanks, @mheon !

@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Nov 18, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Nov 18, 2024
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. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error: database volume path does not match our volume path: database configuration mismatch
6 participants