Repository: mesos Updated Branches: refs/heads/1.6.x 66412d03c -> d565c179b
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/9c5f62dd Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9c5f62dd Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9c5f62dd Branch: refs/heads/1.6.x Commit: 9c5f62dd005a988c36e09d74f28f7fe34bda979f Parents: 66412d0 Author: Zhitao Li <[email protected]> Authored: Tue Jul 3 14:46:58 2018 -0700 Committer: Zhitao Li <[email protected]> Committed: Tue Jul 3 16:10:08 2018 -0700 ---------------------------------------------------------------------- src/slave/gc.cpp | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/9c5f62dd/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; } }
