Updated slave to exit on authentication refusal. Review: https://reviews.apache.org/r/35583
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/effc3636 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/effc3636 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/effc3636 Branch: refs/heads/master Commit: effc3636df64af42c4d1af36014bc5e01408458a Parents: 6d9f9b7 Author: Till Toenshoff <[email protected]> Authored: Sun Jun 21 08:25:49 2015 +0000 Committer: Adam B <[email protected]> Committed: Sun Jun 21 08:32:50 2015 +0000 ---------------------------------------------------------------------- src/slave/slave.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/effc3636/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index 08ff50b..40c0c33 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -803,9 +803,9 @@ void Slave::_authenticate() } if (!future.get()) { - LOG(ERROR) << "Master " << master.get() << " refused authentication"; - shutdown(UPID(), "Master refused authentication"); - return; + // For refused authentication, we exit instead of doing a shutdown + // to keep possibly active executors running. + EXIT(1) << "Master " << master.get() << " refused authentication"; } LOG(INFO) << "Successfully authenticated with master " << master.get();
