Repository: mesos Updated Branches: refs/heads/master 90810115e -> 35eba3923
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/35eba392 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/35eba392 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/35eba392 Branch: refs/heads/master Commit: 35eba392345b9625b3a69948b913c0341912bcd5 Parents: 9081011 Author: Zhitao Li <[email protected]> Authored: Tue Jul 3 14:46:58 2018 -0700 Committer: Zhitao Li <[email protected]> Committed: Tue Jul 3 16:01:53 2018 -0700 ---------------------------------------------------------------------- src/slave/gc.cpp | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/35eba392/src/slave/gc.cpp ---------------------------------------------------------------------- diff --git a/src/slave/gc.cpp b/src/slave/gc.cpp index 407f6b2..450bbef 100644 --- a/src/slave/gc.cpp +++ b/src/slave/gc.cpp @@ -253,6 +253,8 @@ void GarbageCollectorProcess::remove(const Timeout& removalTime) ++failed; it = infos.erase(it); continue; + } else { + break; } }
