Added metrics of messages_quiesce_offers. Review: https://reviews.apache.org/r/38119
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c68f6d71 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c68f6d71 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c68f6d71 Branch: refs/heads/master Commit: c68f6d71327434e50aff72892b9781549ba7616d Parents: 3de5bf0 Author: Guangya Liu <[email protected]> Authored: Fri Sep 18 16:14:04 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Fri Sep 18 16:14:04 2015 -0700 ---------------------------------------------------------------------- src/master/master.cpp | 2 ++ src/master/metrics.cpp | 4 ++++ src/master/metrics.hpp | 1 + src/tests/master_tests.cpp | 1 + src/tests/metrics_tests.cpp | 1 + 5 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c68f6d71/src/master/master.cpp ---------------------------------------------------------------------- diff --git a/src/master/master.cpp b/src/master/master.cpp index 151ce71..64e5fb9 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -2607,6 +2607,8 @@ void Master::quiesce(Framework* framework) LOG(INFO) << "Processing QUIESCE call for framework " << *framework; + ++metrics->messages_quiesce_offers; + allocator->quiesceOffers(framework->id()); } http://git-wip-us.apache.org/repos/asf/mesos/blob/c68f6d71/src/master/metrics.cpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.cpp b/src/master/metrics.cpp index d79206f..6bce80b 100644 --- a/src/master/metrics.cpp +++ b/src/master/metrics.cpp @@ -114,6 +114,8 @@ Metrics::Metrics(const Master& master) "master/messages_decline_offers"), messages_revive_offers( "master/messages_revive_offers"), + messages_quiesce_offers( + "master/messages_quiesce_offers"), messages_reconcile_tasks( "master/messages_reconcile_tasks"), messages_framework_to_executor( @@ -218,6 +220,7 @@ Metrics::Metrics(const Master& master) process::metrics::add(messages_launch_tasks); process::metrics::add(messages_decline_offers); process::metrics::add(messages_revive_offers); + process::metrics::add(messages_quiesce_offers); process::metrics::add(messages_reconcile_tasks); process::metrics::add(messages_framework_to_executor); process::metrics::add(messages_executor_to_framework); @@ -353,6 +356,7 @@ Metrics::~Metrics() process::metrics::remove(messages_launch_tasks); process::metrics::remove(messages_decline_offers); process::metrics::remove(messages_revive_offers); + process::metrics::remove(messages_quiesce_offers); process::metrics::remove(messages_reconcile_tasks); process::metrics::remove(messages_framework_to_executor); process::metrics::remove(messages_executor_to_framework); http://git-wip-us.apache.org/repos/asf/mesos/blob/c68f6d71/src/master/metrics.hpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.hpp b/src/master/metrics.hpp index 2d07a16..a3c0c0c 100644 --- a/src/master/metrics.hpp +++ b/src/master/metrics.hpp @@ -130,6 +130,7 @@ struct Metrics process::metrics::Counter messages_launch_tasks; process::metrics::Counter messages_decline_offers; process::metrics::Counter messages_revive_offers; + process::metrics::Counter messages_quiesce_offers; process::metrics::Counter messages_reconcile_tasks; process::metrics::Counter messages_framework_to_executor; http://git-wip-us.apache.org/repos/asf/mesos/blob/c68f6d71/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 2cb8b3c..a044286 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -1511,6 +1511,7 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("master/messages_launch_tasks")); EXPECT_EQ(1u, snapshot.values.count("master/messages_decline_offers")); EXPECT_EQ(1u, snapshot.values.count("master/messages_revive_offers")); + EXPECT_EQ(1u, snapshot.values.count("master/messages_quiesce_offers")); EXPECT_EQ(1u, snapshot.values.count("master/messages_reconcile_tasks")); EXPECT_EQ(1u, snapshot.values.count("master/messages_framework_to_executor")); http://git-wip-us.apache.org/repos/asf/mesos/blob/c68f6d71/src/tests/metrics_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp index 3e9d7c2..9b7f84a 100644 --- a/src/tests/metrics_tests.cpp +++ b/src/tests/metrics_tests.cpp @@ -97,6 +97,7 @@ TEST_F(MetricsTest, Master) EXPECT_EQ(1u, stats.values.count("master/messages_launch_tasks")); EXPECT_EQ(1u, stats.values.count("master/messages_decline_offers")); EXPECT_EQ(1u, stats.values.count("master/messages_revive_offers")); + EXPECT_EQ(1u, stats.values.count("master/messages_quiesce_offers")); EXPECT_EQ(1u, stats.values.count("master/messages_reconcile_tasks")); EXPECT_EQ(1u, stats.values.count("master/messages_framework_to_executor"));
