Repository: mesos
Updated Branches:
refs/heads/master bf67871bb -> 8385c3793
Added a 'slave_shutdowns_completed' metric.
This allows us to determine the number of pending slave shutdowns,
as the scheduled shutdowns must either be canceled or completed.
Review: https://reviews.apache.org/r/32954
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8385c379
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8385c379
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8385c379
Branch: refs/heads/master
Commit: 8385c37932a5bc97e6e7888e99c0ace6b28412a1
Parents: bf67871
Author: Benjamin Mahler <be...@gmail.com>
Authored: Tue Apr 7 19:25:05 2015 -0700
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Wed Apr 15 12:36:43 2015 -0700
----------------------------------------------------------------------
src/master/master.cpp | 3 +++
src/master/metrics.cpp | 4 ++++
src/master/metrics.hpp | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8385c379/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 6791de0..02f35ac 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -236,6 +236,8 @@ protected:
LOG(INFO) << "Shutting down slave " << slaveId
<< " due to health check timeout";
+ ++metrics->slave_shutdowns_completed;
+
dispatch(master,
&Master::shutdownSlave,
slaveId,
@@ -1323,6 +1325,7 @@ Nothing Master::removeSlave(const Registry::Slave& slave)
<< " within " << flags.slave_reregister_timeout
<< " after master failover; removing it from the registrar";
+ ++metrics->slave_shutdowns_completed;
++metrics->recovery_slave_removals;
slaves.recovered.erase(slave.info().id());
http://git-wip-us.apache.org/repos/asf/mesos/blob/8385c379/src/master/metrics.cpp
----------------------------------------------------------------------
diff --git a/src/master/metrics.cpp b/src/master/metrics.cpp
index 14486bf..973f051 100644
--- a/src/master/metrics.cpp
+++ b/src/master/metrics.cpp
@@ -150,6 +150,8 @@ Metrics::Metrics(const Master& master)
"master/slave_removals"),
slave_shutdowns_scheduled(
"master/slave_shutdowns_scheduled"),
+ slave_shutdowns_completed(
+ "master/slave_shutdowns_completed"),
slave_shutdowns_canceled(
"master/slave_shutdowns_canceled")
{
@@ -224,6 +226,7 @@ Metrics::Metrics(const Master& master)
process::metrics::add(slave_removals);
process::metrics::add(slave_shutdowns_scheduled);
+ process::metrics::add(slave_shutdowns_completed);
process::metrics::add(slave_shutdowns_canceled);
// Create resource gauges.
@@ -326,6 +329,7 @@ Metrics::~Metrics()
process::metrics::remove(slave_removals);
process::metrics::remove(slave_shutdowns_scheduled);
+ process::metrics::remove(slave_shutdowns_completed);
process::metrics::remove(slave_shutdowns_canceled);
foreach (const process::metrics::Gauge& gauge, resources_total) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/8385c379/src/master/metrics.hpp
----------------------------------------------------------------------
diff --git a/src/master/metrics.hpp b/src/master/metrics.hpp
index 52a8328..ee3982e 100644
--- a/src/master/metrics.hpp
+++ b/src/master/metrics.hpp
@@ -166,6 +166,7 @@ struct Metrics
// Slave observer metrics.
process::metrics::Counter slave_shutdowns_scheduled;
+ process::metrics::Counter slave_shutdowns_completed;
process::metrics::Counter slave_shutdowns_canceled;
// Resource metrics.