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

daemon/mount: Avoid potential race if sshfs_mount exits quickly #514

Merged
merged 1 commit into from
Dec 7, 2018

Conversation

townsend2010
Copy link
Contributor

This will avoid a state where the sftp_server/sshfs pair is not running, but the daemon still holds the info in memory.

Fixes #511

@codecov
Copy link

codecov bot commented Dec 6, 2018

Codecov Report

Merging #514 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #514   +/-   ##
=======================================
  Coverage   66.45%   66.45%           
=======================================
  Files         146      146           
  Lines        5676     5676           
=======================================
  Hits         3772     3772           
  Misses       1904     1904
Impacted Files Coverage Δ
src/daemon/daemon.cpp 21.36% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cbe1bde...7b6556e. Read the comment docs.

@codecov
Copy link

codecov bot commented Dec 6, 2018

Codecov Report

Merging #514 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #514   +/-   ##
=======================================
  Coverage   66.45%   66.45%           
=======================================
  Files         146      146           
  Lines        5676     5676           
=======================================
  Hits         3772     3772           
  Misses       1904     1904
Impacted Files Coverage Δ
src/daemon/daemon.cpp 21.36% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cbe1bde...d124766. Read the comment docs.

This will avoid a state where the sftp_server/sshfs pair is not running, but the daemon still holds the info in memory.

Fixes #511
@townsend2010 townsend2010 force-pushed the fix-mount-failure-race branch from 7b6556e to d124766 Compare December 6, 2018 19:55
@Saviq Saviq requested a review from ricab December 7, 2018 17:26
@ricab
Copy link
Collaborator

ricab commented Dec 7, 2018

bors r+

bors bot added a commit that referenced this pull request Dec 7, 2018
514: daemon/mount: Avoid potential race if sshfs_mount exits quickly r=ricab a=townsend2010

This will avoid a state where the sftp_server/sshfs pair is not running, but the daemon still holds the info in memory.

Fixes #511

Co-authored-by: Chris Townsend <[email protected]>
@bors
Copy link
Contributor

bors bot commented Dec 7, 2018

Build succeeded

@bors bors bot merged commit d124766 into master Dec 7, 2018
@bors bors bot deleted the fix-mount-failure-race branch December 7, 2018 18:52
@Saviq Saviq mentioned this pull request Dec 20, 2018
bors bot added a commit that referenced this pull request Dec 20, 2018
551: Release 2018.12.1 r=townsend2010 a=Saviq

### Highlights

- On Linux, suspending/resuming the instance to/from disk is now supported. (#374)
- Better handling of delayed shutdown including posting `wall` messages to logged in users and allowing log ins to the instance unless 1 minute or less remains until shutdown. (#461, #50) 
- On Linux, all CPU flags should be passed into the running instance on newly created instances. (#516)
- Fixed some races around mount handling. (#514, #520)

### Bugs fixed:

- make the recover command idempotent (#528)
- explicitly stop mounts when deleting an instance to avoid a race (#520)
- be smarter about what group owns the multipass socket (#513, #523) 
- pass through all CPU flags when launching QEMU or libvirt instances (#516)
- use `info` log level for metrics issues (#515)
- fix potential race when starting a mount (#514)
- use `wall` shutdown messages for users logged into VM when delayed shutdown is initiated (#501)
- fix crash if exception during daemon start up (#487)
- refactor CLI code (#468)
- add default uid/gid mapping (#331)
- fix file metadata passthrough
- display uid/gid maps in info command (#439)
- add support for the suspend command (#374)
- shell to machine in delayed stop state (#461)
- improve uid/gid validation (#479)
- avoid leaking the libvirt bridge (#327, #413)
- add a restart command (#217)
- upgrade 3rd-party versions (#471)

Co-authored-by: bors[bot] <bors[bot]@users.noreply.github.com>
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