Repository: mesos Updated Branches: refs/heads/1.4.x 652eeb83f -> 1830c0538
Avoid duplicate unmount dangling mount point. We could potentially schedule the framework dir, executor dir, and executor run sandbox to gc at the same time, and then these paths will be gc independently, although they are parents and children directories. This patch makes sure we do not call unmount anymore after a success. Review: https://reviews.apache.org/r/67822 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/024fa3c9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/024fa3c9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/024fa3c9 Branch: refs/heads/1.4.x Commit: 024fa3c9fa18363fd416290ff5271dc0bf7579f2 Parents: 652eeb8 Author: Zhitao Li <[email protected]> Authored: Tue Jul 3 14:46:58 2018 -0700 Committer: Zhitao Li <[email protected]> Committed: Tue Jul 3 16:13:29 2018 -0700 ---------------------------------------------------------------------- src/slave/gc.cpp | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/024fa3c9/src/slave/gc.cpp ---------------------------------------------------------------------- diff --git a/src/slave/gc.cpp b/src/slave/gc.cpp index 415fe27..d769e49 100644 --- a/src/slave/gc.cpp +++ b/src/slave/gc.cpp @@ -212,6 +212,8 @@ void GarbageCollectorProcess::remove(const Timeout& removalTime) info->promise.fail(unmount.error()); it = infos.erase(it); continue; + } else { + break; } }
