mesos git commit: Fixed executor termination logic in some error cases.

[jo...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 09d0c3df7 -> 7c2dee0a3


Fixed executor termination logic in some error cases.

Review: https://reviews.apache.org/r/41539/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c2dee0a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c2dee0a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c2dee0a

Branch: refs/heads/master
Commit: 7c2dee0a3820e7c2d4dde07181980b3222b36537
Parents: 09d0c3d
Author: Guangya Liu <gy...@gmail.com>
Authored: Mon Dec 21 17:54:39 2015 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Dec 21 18:17:16 2015 -0500

----------------------------------------------------------------------
 src/slave/slave.cpp | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/7c2dee0a/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index ef86969..9d80c96 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -4032,6 +4032,7 @@ void Slave::shutdownExecutor(
   if (!framework->executors.contains(executorId)) {
     LOG(WARNING) << "Ignoring shutdown of unknown executor '" << executorId
                  << "' of framework " << frameworkId;
+    return;
   }
 
   Executor* executor = framework->executors[executorId];
@@ -4046,6 +4047,7 @@ void Slave::shutdownExecutor(
     LOG(WARNING) << "Ignoring shutdown executor '" << executorId
                  << "' of framework " << frameworkId
                  << " because the executor is terminating/terminated";
+    return;
   }
 
   _shutdownExecutor(framework, executor);