You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/06/29 00:03:27 UTC
git commit: Fixed a crash in the ProcessIsolator.
Updated Branches:
refs/heads/master 978acbbbb -> ddbb090e7
Fixed a crash in the ProcessIsolator.
Review: https://reviews.apache.org/r/12179
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/ddbb090e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/ddbb090e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/ddbb090e
Branch: refs/heads/master
Commit: ddbb090e7f75c7f55d781a0db3dc66a00023985a
Parents: 978acbb
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Fri Jun 28 14:15:07 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Fri Jun 28 15:03:17 2013 -0700
----------------------------------------------------------------------
src/slave/process_isolator.cpp | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/ddbb090e/src/slave/process_isolator.cpp
----------------------------------------------------------------------
diff --git a/src/slave/process_isolator.cpp b/src/slave/process_isolator.cpp
index 86616e4..e5496f3 100644
--- a/src/slave/process_isolator.cpp
+++ b/src/slave/process_isolator.cpp
@@ -405,6 +405,11 @@ Future<ResourceStatistics> ProcessIsolator::usage(
foreach (pid_t child, children.get()) {
process = os::process(child);
+ // Skip processes that disappear.
+ if (process.isNone()) {
+ continue;
+ }
+
if (process.isError()) {
LOG(WARNING) << "Failed to get status of descendant process " << child
<< " of parent " << info->pid.get() << ": "