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

guestfs: create mount folder if initially computed one is busy #55672

Merged
merged 1 commit into from
Jan 6, 2020

Conversation

cbosdo
Copy link
Contributor

@cbosdo cbosdo commented Dec 17, 2019

What does this PR do?

When mounting an image, if the computed folder is already existing and
not empty, then we try to find another one that could be used. But then
we need to create the folder if needed.

What issues does this PR fix or reference?

Issue #55349.

Previous Behavior

Running this fails:

mkdir -p /tmp/guest/var.testsuite-data.disk-image-template.qcow2/foobar
salt-call --local guestfs.mount /var/testsuite-data/disk-image-template.qcow2

New Behavior

Running the same mounts the image without error

Tests written?

Yes

Commits signed with GPG?

Yes

@cbosdo cbosdo requested a review from a team as a code owner December 17, 2019 09:34
@ghost ghost requested a review from Ch3LL December 17, 2019 09:34
@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 17, 2019

@waynew since you were involved in the issue, you may want to review that PR

@codecov
Copy link

codecov bot commented Dec 26, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@ad100e2). Click here to learn what that means.
The diff coverage is 60%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #55672   +/-   ##
=========================================
  Coverage          ?   39.15%           
=========================================
  Files             ?     1466           
  Lines             ?   260246           
  Branches          ?    56399           
=========================================
  Hits              ?   101866           
  Misses            ?   147200           
  Partials          ?    11180
Flag Coverage Δ
#amazon2 37.76% <40%> (?)
#debian8 38.25% <40%> (?)
#debian9 38.23% <40%> (?)
#fedora31 38.28% <40%> (?)
#py2 38.28% <40%> (?)
#py3 38.34% <40%> (?)
#runtests 39.15% <60%> (?)
#zeromq 39.15% <60%> (?)
Impacted Files Coverage Δ
salt/modules/guestfs.py 80.56% <60%> (ø)

salt/modules/guestfs.py Outdated Show resolved Hide resolved
When mounting an image, if the computed folder is already existing and
not empty, then we try to find another one that could be used. But then
we need to create the folder if needed. See issue 55349.
@dwoz
Copy link
Contributor

dwoz commented Jan 6, 2020

re-run full centos

@dwoz dwoz merged commit 2df28f7 into saltstack:master Jan 6, 2020
@cbosdo cbosdo deleted the master-guestfs-mount branch January 7, 2020 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants