You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/05/13 00:35:25 UTC
git commit: Added slave operation counters to Master.
Repository: mesos
Updated Branches:
refs/heads/master 1c075e967 -> 4faf21555
Added slave operation counters to Master.
Review: https://reviews.apache.org/r/21290
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4faf2155
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4faf2155
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4faf2155
Branch: refs/heads/master
Commit: 4faf215559e23c0180ff3a2164fd6045456927ca
Parents: 1c075e9
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Mon May 12 15:34:39 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon May 12 15:34:39 2014 -0700
----------------------------------------------------------------------
src/master/master.cpp | 6 ++++++
src/master/master.hpp | 21 ++++++++++++++++++++-
2 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4faf2155/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 0499877..569995c 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2172,6 +2172,7 @@ void Master::_registerSlave(
Slave* slave = new Slave(slaveInfo, slaveInfo.id(), pid, Clock::now());
LOG(INFO) << "Registered slave " << *slave;
+ ++metrics.slave_registrations;
addSlave(slave);
}
@@ -2357,6 +2358,7 @@ void Master::_reregisterSlave(
slave->reregisteredTime = Clock::now();
LOG(INFO) << "Re-registered slave " << *slave;
+ ++metrics.slave_reregistrations;
readdSlave(slave, executorInfos, tasks, completedFrameworks);
@@ -3518,6 +3520,10 @@ void Master::_removeSlave(
<< "Slave " << slaveInfo.id() << " (" << slaveInfo.hostname() << ") "
<< "already removed from the registrar";
+ LOG(INFO) << "Removed slave " << slaveInfo.id() << " ("
+ << slaveInfo.hostname() << ")";
+ ++metrics.slave_removals;
+
// Forward the LOST updates on to the framework.
foreach (const StatusUpdate& update, updates) {
Try<Nothing> _forward = forward(update, UPID());
http://git-wip-us.apache.org/repos/asf/mesos/blob/4faf2155/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index de2ae62..923552e 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -488,7 +488,13 @@ private:
"master/recovery_slave_removals"),
event_queue_size(
"master/event_queue_size",
- defer(master, &Master::_event_queue_size))
+ defer(master, &Master::_event_queue_size)),
+ slave_registrations(
+ "master/slave_registrations"),
+ slave_reregistrations(
+ "master/slave_reregistrations"),
+ slave_removals(
+ "master/slave_removals")
{
process::metrics::add(dropped_messages);
@@ -501,6 +507,10 @@ private:
process::metrics::add(recovery_slave_removals);
process::metrics::add(event_queue_size);
+
+ process::metrics::add(slave_registrations);
+ process::metrics::add(slave_reregistrations);
+ process::metrics::add(slave_removals);
}
~Metrics()
@@ -516,6 +526,10 @@ private:
process::metrics::remove(recovery_slave_removals);
process::metrics::remove(event_queue_size);
+
+ process::metrics::remove(slave_registrations);
+ process::metrics::remove(slave_reregistrations);
+ process::metrics::remove(slave_removals);
}
// Message counters.
@@ -534,6 +548,11 @@ private:
// Process metrics.
process::metrics::Gauge event_queue_size;
+
+ // Successful registry operations.
+ process::metrics::Counter slave_registrations;
+ process::metrics::Counter slave_reregistrations;
+ process::metrics::Counter slave_removals;
} metrics;
// Gauge handlers.