facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-04 22:07:44 +03:00
Code Issues Projects Releases Wiki Activity

Make sure shutdown() errors propagate to unmount() waiters

Browse Source 
Summary: Use SharedPromise::setFuture to make sure errors propagate.

Reviewed By: simpkins

Differential Revision: D6515818

fbshipit-source-id: dee95bccdc086a040ead08e60373cbc7daa4db3f
This commit is contained in:
Chad Austin 2017-12-11 18:01:15 -08:00 committed by Facebook Github Bot
parent 0b74d03fbd
commit 5eaddd7921
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eden/fs/service/EdenServer.cpp
View File

@ -542,10 +542,10 @@ void EdenServer::mountFinished(EdenMount* edenMount) {
// Shutdown the EdenMount, and fulfill the unmount promise
// when the shutdown completes
edenMount->shutdown().then(
[unmountPromise = std::move(unmountPromise)]() mutable {
unmountPromise.setValue();
});
edenMount->shutdown().then([unmountPromise = std::move(unmountPromise)](
folly::Try<folly::Unit>&& result) mutable {
unmountPromise.setTry(std::move(result));
});
}
EdenServer::MountList EdenServer::getMountPoints() const {

2
eden/fs/service/EdenServer.h
View File

@ -203,7 +203,7 @@ class EdenServer : private TakeoverHandler {
private:
// Struct to store EdenMount along with SharedPromise that is set
// during unmount to allow synchronizaiton between unmoutFinished
// during unmount to allow synchronization between unmountFinished
// and unmount functions.
struct EdenMountInfo {
std::shared_ptr<EdenMount> edenMount;