Repository: mesos Updated Branches: refs/heads/master 7c26c44d9 -> c532490bf
Fixed mutex deadlock issue in ~scheduler::Mesos(). Review: https://reviews.apache.org/r/37559 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c532490b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c532490b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c532490b Branch: refs/heads/master Commit: c532490bfcb4470d0614640031ff854af8876ef6 Parents: 7c26c44 Author: Vinod Kone <[email protected]> Authored: Mon Aug 17 15:45:51 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Aug 17 17:31:47 2015 -0700 ---------------------------------------------------------------------- src/scheduler/scheduler.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c532490b/src/scheduler/scheduler.cpp ---------------------------------------------------------------------- diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp index d3d6682..37f41de 100644 --- a/src/scheduler/scheduler.cpp +++ b/src/scheduler/scheduler.cpp @@ -184,8 +184,7 @@ public: local::shutdown(); } - // Wait for any callbacks to finish. - mutex.lock().await(); + // Note that we ignore any callbacks that are enqueued. } // TODO(benh): Move this to 'protected'.
