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 2014/05/28 00:09:02 UTC
git commit: Updated metric names for consistency.
Repository: mesos
Updated Branches:
refs/heads/master 997397051 -> 10bc2b923
Updated metric names for consistency.
Review: https://reviews.apache.org/r/21720
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/10bc2b92
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/10bc2b92
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/10bc2b92
Branch: refs/heads/master
Commit: 10bc2b923ff49426134e778f3832bd690b2b968b
Parents: 9973970
Author: Dominic Hamon <dh...@twopensource.com>
Authored: Tue May 27 15:07:31 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Tue May 27 15:07:35 2014 -0700
----------------------------------------------------------------------
src/master/master.cpp | 44 ++++++++++++++++++++---------------------
src/master/master.hpp | 18 ++++++++---------
src/slave/slave.cpp | 10 +++++-----
src/slave/slave.hpp | 4 ++--
src/tests/master_tests.cpp | 8 ++++----
src/tests/slave_tests.cpp | 2 +-
6 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index ae738bb..21472e9 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -3763,7 +3763,7 @@ SlaveID Master::newSlaveId()
}
-double Master::_active_slaves()
+double Master::_slaves_active()
{
double count = 0.0;
foreachvalue (Slave* slave, slaves.activated) {
@@ -3775,7 +3775,7 @@ double Master::_active_slaves()
}
-double Master::_inactive_slaves()
+double Master::_slaves_inactive()
{
double count = 0.0;
foreachvalue (Slave* slave, slaves.activated) {
@@ -3854,18 +3854,18 @@ Master::Metrics::Metrics(const Master& master)
elected(
"master/elected",
defer(master, &Master::_elected)),
- active_slaves(
- "master/active_slaves",
- defer(master, &Master::_active_slaves)),
- inactive_slaves(
- "master/inactive_slaves",
- defer(master, &Master::_inactive_slaves)),
- active_frameworks(
- "master/active_frameworks",
- defer(master, &Master::_active_frameworks)),
- inactive_frameworks(
- "master/inactive_frameworks",
- defer(master, &Master::_inactive_frameworks)),
+ slaves_active(
+ "master/slaves_active",
+ defer(master, &Master::_slaves_active)),
+ slaves_inactive(
+ "master/slaves_inactive",
+ defer(master, &Master::_slaves_inactive)),
+ frameworks_active(
+ "master/frameworks_active",
+ defer(master, &Master::_frameworks_active)),
+ frameworks_inactive(
+ "master/frameworks_inactive",
+ defer(master, &Master::_frameworks_inactive)),
outstanding_offers(
"master/outstanding_offers",
defer(master, &Master::_outstanding_offers)),
@@ -3944,11 +3944,11 @@ Master::Metrics::Metrics(const Master& master)
process::metrics::add(uptime_secs);
process::metrics::add(elected);
- process::metrics::add(active_slaves);
- process::metrics::add(inactive_slaves);
+ process::metrics::add(slaves_active);
+ process::metrics::add(slaves_inactive);
- process::metrics::add(active_frameworks);
- process::metrics::add(inactive_frameworks);
+ process::metrics::add(frameworks_active);
+ process::metrics::add(frameworks_inactive);
process::metrics::add(outstanding_offers);
@@ -4031,11 +4031,11 @@ Master::Metrics::~Metrics()
process::metrics::remove(uptime_secs);
process::metrics::remove(elected);
- process::metrics::remove(active_slaves);
- process::metrics::remove(inactive_slaves);
+ process::metrics::remove(slaves_active);
+ process::metrics::remove(slaves_inactive);
- process::metrics::remove(active_frameworks);
- process::metrics::remove(inactive_frameworks);
+ process::metrics::remove(frameworks_active);
+ process::metrics::remove(frameworks_inactive);
process::metrics::remove(outstanding_offers);
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/master/master.hpp
----------------------------------------------------------------------
diff --git a/src/master/master.hpp b/src/master/master.hpp
index 847d7c7..f0490ec 100644
--- a/src/master/master.hpp
+++ b/src/master/master.hpp
@@ -485,11 +485,11 @@ private:
process::metrics::Gauge uptime_secs;
process::metrics::Gauge elected;
- process::metrics::Gauge active_slaves;
- process::metrics::Gauge inactive_slaves;
+ process::metrics::Gauge slaves_active;
+ process::metrics::Gauge slaves_inactive;
- process::metrics::Gauge active_frameworks;
- process::metrics::Gauge inactive_frameworks;
+ process::metrics::Gauge frameworks_active;
+ process::metrics::Gauge frameworks_inactive;
process::metrics::Gauge outstanding_offers;
@@ -561,18 +561,18 @@ private:
return elected() ? 1 : 0;
}
- double _active_slaves();
+ double _slaves_active();
- double _inactive_slaves();
+ double _slaves_inactive();
- double _active_frameworks()
+ double _frameworks_active()
{
return getActiveFrameworks().size();
}
- double _inactive_frameworks()
+ double _frameworks_inactive()
{
- return frameworks.activated.size() - _active_frameworks();
+ return frameworks.activated.size() - _frameworks_active();
}
double _outstanding_offers()
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index a4b9570..e8fc7c6 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -3161,9 +3161,9 @@ Slave::Metrics::Metrics(const Slave& slave)
defer(slave, &Slave::_registered)),
recovery_errors(
"slave/recovery_errors"),
- active_frameworks(
- "slave/active_frameworks",
- defer(slave, &Slave::_active_frameworks)),
+ frameworks_active(
+ "slave/frameworks_active",
+ defer(slave, &Slave::_frameworks_active)),
tasks_staging(
"slave/tasks_staging",
defer(slave, &Slave::_tasks_staging)),
@@ -3196,7 +3196,7 @@ Slave::Metrics::Metrics(const Slave& slave)
process::metrics::add(recovery_errors);
- process::metrics::add(active_frameworks);
+ process::metrics::add(frameworks_active);
process::metrics::add(tasks_staging);
process::metrics::add(tasks_starting);
@@ -3222,7 +3222,7 @@ Slave::Metrics::~Metrics()
process::metrics::remove(recovery_errors);
- process::metrics::remove(active_frameworks);
+ process::metrics::remove(frameworks_active);
process::metrics::remove(tasks_staging);
process::metrics::remove(tasks_starting);
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index 769bd00..57f84f7 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -334,7 +334,7 @@ private:
Slave& operator = (const Slave&); // No assigning.
// Gauge methods.
- double _active_frameworks()
+ double _frameworks_active()
{
return frameworks.size();
}
@@ -393,7 +393,7 @@ private:
process::metrics::Counter recovery_errors;
- process::metrics::Gauge active_frameworks;
+ process::metrics::Gauge frameworks_active;
process::metrics::Gauge tasks_staging;
process::metrics::Gauge tasks_starting;
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index b0e05de..f607d89 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1414,11 +1414,11 @@ TEST_F(MasterTest, MetricsInStatsEndpoint)
EXPECT_EQ(1, stats.values["elected"]);
EXPECT_EQ(1, stats.values["master/elected"]);
- EXPECT_EQ(1u, stats.values.count("master/active_slaves"));
- EXPECT_EQ(1u, stats.values.count("master/inactive_slaves"));
+ EXPECT_EQ(1u, stats.values.count("master/slaves_active"));
+ EXPECT_EQ(1u, stats.values.count("master/slaves_inactive"));
- EXPECT_EQ(1u, stats.values.count("master/active_frameworks"));
- EXPECT_EQ(1u, stats.values.count("master/inactive_frameworks"));
+ EXPECT_EQ(1u, stats.values.count("master/frameworks_active"));
+ EXPECT_EQ(1u, stats.values.count("master/frameworks_inactive"));
EXPECT_EQ(1u, stats.values.count("master/outstanding_offers"));
http://git-wip-us.apache.org/repos/asf/mesos/blob/10bc2b92/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 85ca5c4..bd0796a 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -567,7 +567,7 @@ TEST_F(SlaveTest, MetricsInStatsEndpoint)
EXPECT_EQ(1u, stats.values.count("slave/recovery_errors"));
- EXPECT_EQ(1u, stats.values.count("slave/active_frameworks"));
+ EXPECT_EQ(1u, stats.values.count("slave/frameworks_active"));
EXPECT_EQ(1u, stats.values.count("slave/tasks_staging"));
EXPECT_EQ(1u, stats.values.count("slave/tasks_starting"));