You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/09/19 22:50:07 UTC
[14/27] mesos git commit: Tweaked logging for UnregisterSlaveMessage
handler.
Tweaked logging for UnregisterSlaveMessage handler.
Remove a redundant log line: rather than logging when we receive
an UnregisterSlaveMessage, it is sufficient to log how we handle
that message. Also ensure that we log when ignoring an agent
unregister message for an unknown agent, and do some minor code
cleanup.
Review: https://reviews.apache.org/r/51706/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0d85e7eb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0d85e7eb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0d85e7eb
Branch: refs/heads/master
Commit: 0d85e7eb4b2da50ebd79f4ef53183745eba42f48
Parents: 9dad0b0
Author: Neil Conway <ne...@gmail.com>
Authored: Mon Sep 19 15:48:23 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Mon Sep 19 15:48:23 2016 -0700
----------------------------------------------------------------------
src/master/master.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d85e7eb/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 5089b99..4e0df8a 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -5458,20 +5458,23 @@ void Master::unregisterSlave(const UPID& from, const SlaveID& slaveId)
{
++metrics->messages_unregister_slave;
- LOG(INFO) << "Asked to unregister agent " << slaveId;
-
Slave* slave = slaves.registered.get(slaveId);
- if (slave != nullptr) {
- if (slave->pid != from) {
- LOG(WARNING) << "Ignoring unregister agent message from " << from
- << " because it is not the agent " << slave->pid;
- return;
- }
- removeSlave(slave,
- "the agent unregistered",
- metrics->slave_removals_reason_unregistered);
+ if (slave == nullptr) {
+ LOG(WARNING) << "Ignoring unregister agent message from " << from
+ << " for unknown agent";
+ return;
}
+
+ if (slave->pid != from) {
+ LOG(WARNING) << "Ignoring unregister agent message from " << from
+ << " because it is not the agent " << slave->pid;
+ return;
+ }
+
+ removeSlave(slave,
+ "the agent unregistered",
+ metrics->slave_removals_reason_unregistered);
}