Repository: mesos Updated Branches: refs/heads/master f348070b7 -> 4a9c63ac4
Short term fix for MESOS-1866. Review: https://reviews.apache.org/r/26400 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4a9c63ac Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4a9c63ac Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4a9c63ac Branch: refs/heads/master Commit: 4a9c63ac496297d02e9ccc54f8a80b1061a0d39b Parents: f348070 Author: Vinod Kone <[email protected]> Authored: Mon Oct 6 18:46:00 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Oct 6 18:50:13 2014 -0700 ---------------------------------------------------------------------- src/sasl/authenticator.hpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4a9c63ac/src/sasl/authenticator.hpp ---------------------------------------------------------------------- diff --git a/src/sasl/authenticator.hpp b/src/sasl/authenticator.hpp index a3ae2a5..6f4d3db 100644 --- a/src/sasl/authenticator.hpp +++ b/src/sasl/authenticator.hpp @@ -440,7 +440,12 @@ Authenticator::Authenticator(const process::UPID& pid) Authenticator::~Authenticator() { - process::terminate(process); + // TODO(vinod): As a short term fix for the race condition #1 in + // MESOS-1866, we inject the 'terminate' event at the end of the + // AuthenticatorProcess queue instead of at the front. + // The long term fix for this https://reviews.apache.org/r/25945/. + process::terminate(process, false); + process::wait(process); delete process; }
