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/06/21 00:24:37 UTC
git commit: Added dispatch and http event queue metrics to master.
Repository: mesos
Updated Branches:
refs/heads/master 9f4698ed5 -> a991580d7
Added dispatch and http event queue metrics to master.
Review: https://reviews.apache.org/r/22817
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a991580d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a991580d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a991580d
Branch: refs/heads/master
Commit: a991580d7d98d373354e014fdaaebe80d5d47bec
Parents: 9f4698e
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Fri Jun 20 15:23:56 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Fri Jun 20 15:23:59 2014 -0700
----------------------------------------------------------------------
src/master/master.cpp | 20 +++++++++++++++-----
src/master/master.hpp | 16 ++++++++++++++--
src/sched/sched.cpp | 14 +++++++-------
src/tests/master_tests.cpp | 4 +++-
src/tests/scheduler_tests.cpp | 2 +-
5 files changed, 40 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a991580d/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index dcf28ad..00152f5 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -4480,9 +4480,15 @@ Master::Metrics::Metrics(const Master& master)
"master/invalid_status_update_acknowledgements"),
recovery_slave_removals(
"master/recovery_slave_removals"),
- message_event_queue_size(
- "master/message_event_queue_size",
- defer(master, &Master::_message_event_queue_size)),
+ event_queue_messages(
+ "master/event_queue_messages",
+ defer(master, &Master::_event_queue_messages)),
+ event_queue_dispatches(
+ "master/event_queue_dispatches",
+ defer(master, &Master::_event_queue_dispatches)),
+ event_queue_http_requests(
+ "master/event_queue_http_requests",
+ defer(master, &Master::_event_queue_http_requests)),
slave_registrations(
"master/slave_registrations"),
slave_reregistrations(
@@ -4546,7 +4552,9 @@ Master::Metrics::Metrics(const Master& master)
process::metrics::add(recovery_slave_removals);
- process::metrics::add(message_event_queue_size);
+ process::metrics::add(event_queue_messages);
+ process::metrics::add(event_queue_dispatches);
+ process::metrics::add(event_queue_http_requests);
process::metrics::add(slave_registrations);
process::metrics::add(slave_reregistrations);
@@ -4637,7 +4645,9 @@ Master::Metrics::~Metrics()
process::metrics::remove(recovery_slave_removals);
- process::metrics::remove(message_event_queue_size);
+ process::metrics::remove(event_queue_messages);
+ process::metrics::remove(event_queue_dispatches);
+ process::metrics::remove(event_queue_http_requests);
process::metrics::remove(slave_registrations);
process::metrics::remove(slave_reregistrations);
http://git-wip-us.apache.org/repos/asf/mesos/blob/a991580d/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index b56e9f4..f4cdb26 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -640,7 +640,9 @@ private:
process::metrics::Counter recovery_slave_removals;
// Process metrics.
- process::metrics::Gauge message_event_queue_size;
+ process::metrics::Gauge event_queue_messages;
+ process::metrics::Gauge event_queue_dispatches;
+ process::metrics::Gauge event_queue_http_requests;
// Successful registry operations.
process::metrics::Counter slave_registrations;
@@ -683,11 +685,21 @@ private:
return offers.size();
}
- double _message_event_queue_size()
+ double _event_queue_messages()
{
return static_cast<double>(eventCount<process::MessageEvent>());
}
+ double _event_queue_dispatches()
+ {
+ return static_cast<double>(eventCount<process::DispatchEvent>());
+ }
+
+ double _event_queue_http_requests()
+ {
+ return static_cast<double>(eventCount<process::HttpEvent>());
+ }
+
double _tasks_staging();
double _tasks_starting();
double _tasks_running();
http://git-wip-us.apache.org/repos/asf/mesos/blob/a991580d/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index 6da7159..869f50a 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -1010,27 +1010,27 @@ private:
struct Metrics
{
Metrics(const SchedulerProcess& schedulerProcess)
- : message_event_queue_size(
- "scheduler/message_event_queue_size",
- defer(schedulerProcess, &SchedulerProcess::_message_event_queue_size))
+ : event_queue_messages(
+ "scheduler/event_queue_messages",
+ defer(schedulerProcess, &SchedulerProcess::_event_queue_messages))
{
// TODO(dhamon): When we start checking the return value of 'add' we may
// get failures in situations where multiple SchedulerProcesses are active
// (ie, the fault tolerance tests). At that point we'll need MESOS-1285 to
// be fixed and to use self().id in the metric name.
- process::metrics::add(message_event_queue_size);
+ process::metrics::add(event_queue_messages);
}
~Metrics()
{
- process::metrics::remove(message_event_queue_size);
+ process::metrics::remove(event_queue_messages);
}
// Process metrics.
- process::metrics::Gauge message_event_queue_size;
+ process::metrics::Gauge event_queue_messages;
} metrics;
- double _message_event_queue_size()
+ double _event_queue_messages()
{
return static_cast<double>(eventCount<MessageEvent>());
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/a991580d/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index f0bd1fc..885e0fb 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1487,7 +1487,9 @@ TEST_F(MasterTest, MetricsInStatsEndpoint)
EXPECT_EQ(1u, stats.values.count("master/recovery_slave_removals"));
- EXPECT_EQ(1u, stats.values.count("master/message_event_queue_size"));
+ EXPECT_EQ(1u, stats.values.count("master/event_queue_messages"));
+ EXPECT_EQ(1u, stats.values.count("master/event_queue_dispatches"));
+ EXPECT_EQ(1u, stats.values.count("master/event_queue_http_requests"));
EXPECT_EQ(1u, stats.values.count("master/cpus_total"));
EXPECT_EQ(1u, stats.values.count("master/cpus_used"));
http://git-wip-us.apache.org/repos/asf/mesos/blob/a991580d/src/tests/scheduler_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp
index f6e837e..d6a7867 100644
--- a/src/tests/scheduler_tests.cpp
+++ b/src/tests/scheduler_tests.cpp
@@ -241,7 +241,7 @@ TEST_F(MesosSchedulerDriverTest, MetricsEndpoint)
JSON::Object metrics = parse.get();
- EXPECT_EQ(1u, metrics.values.count("scheduler/message_event_queue_size"));
+ EXPECT_EQ(1u, metrics.values.count("scheduler/event_queue_messages"));
driver.stop();
driver.join();