Fixed authentication failure triggered slave crash. Review: https://reviews.apache.org/r/31838
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6d9f9b7a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6d9f9b7a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6d9f9b7a Branch: refs/heads/master Commit: 6d9f9b7ac6c690ed3a1690a108f95577375d6f68 Parents: b3a3d53 Author: Till Toenshoff <[email protected]> Authored: Sun Jun 21 08:28:14 2015 +0000 Committer: Adam B <[email protected]> Committed: Sun Jun 21 08:32:50 2015 +0000 ---------------------------------------------------------------------- src/slave/slave.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6d9f9b7a/src/slave/slave.cpp ---------------------------------------------------------------------- diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp index e73913b..08ff50b 100644 --- a/src/slave/slave.cpp +++ b/src/slave/slave.cpp @@ -601,12 +601,14 @@ void Slave::shutdown(const UPID& from, const string& message) if (from) { LOG(INFO) << "Slave asked to shut down by " << from << (message.empty() ? "" : " because '" + message + "'"); - } else { + } else if (info.has_id()) { LOG(INFO) << message << "; unregistering and shutting down"; UnregisterSlaveMessage message_; message_.mutable_slave_id()->MergeFrom(info.id()); send(master.get(), message_); + } else { + LOG(INFO) << message << "; shutting down"; } state = TERMINATING;
