You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/08 19:07:01 UTC
mesos git commit: Fixed cleanup logic in cgroups net_cls isolator.
Repository: mesos
Updated Branches:
refs/heads/master 4c9e3f419 -> 7a6dda708
Fixed cleanup logic in cgroups net_cls isolator.
We should be responsible for freeing a handle only if the handle manager
is set.
Review: https://reviews.apache.org/r/43292/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7a6dda70
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7a6dda70
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7a6dda70
Branch: refs/heads/master
Commit: 7a6dda7086b443539eb3bd4fed3a783512e6a003
Parents: 4c9e3f4
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Mon Feb 8 09:19:47 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Feb 8 10:02:25 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7a6dda70/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
index fd67409..f8eb587 100644
--- a/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
+++ b/src/slave/containerizer/mesos/isolators/cgroups/net_cls.cpp
@@ -537,7 +537,7 @@ Future<Nothing> CgroupsNetClsIsolatorProcess::_cleanup(
const Info& info = infos.at(containerId);
- if (info.handle.isSome()) {
+ if (info.handle.isSome() && handleManager.isSome()) {
Try<Nothing> free = handleManager->free(info.handle.get());
if (free.isError()) {
return Failure("Could not free the net_cls handle: " + free.error());