Added a master metric for operation reconciliation messages. Review: https://reviews.apache.org/r/66463/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c7c38483 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c7c38483 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c7c38483 Branch: refs/heads/master Commit: c7c384832905945aa3ef8cf02ed6ad20256290e7 Parents: 918f99e Author: Gaston Kleiman <[email protected]> Authored: Mon Apr 23 13:43:34 2018 -0700 Committer: Greg Mann <[email protected]> Committed: Mon Apr 23 13:48:49 2018 -0700 ---------------------------------------------------------------------- docs/monitoring.md | 7 +++++++ docs/operator-http-api.md | 4 ++++ src/master/metrics.cpp | 4 ++++ src/master/metrics.hpp | 1 + src/tests/master_tests.cpp | 1 + 5 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c7c38483/docs/monitoring.md ---------------------------------------------------------------------- diff --git a/docs/monitoring.md b/docs/monitoring.md index 12e2103..34cfd05 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -665,6 +665,13 @@ messages may indicate that there is a problem with the network. </tr> <tr> <td> + <code>master/messages_reconcile_operations</code> + </td> + <td>Number of reconcile operations messages</td> + <td>Counter</td> +</tr> +<tr> + <td> <code>master/messages_reconcile_tasks</code> </td> <td>Number of reconcile task messages</td> http://git-wip-us.apache.org/repos/asf/mesos/blob/c7c38483/docs/operator-http-api.md ---------------------------------------------------------------------- diff --git a/docs/operator-http-api.md b/docs/operator-http-api.md index 10dcac8..9be1e2d 100644 --- a/docs/operator-http-api.md +++ b/docs/operator-http-api.md @@ -677,6 +677,10 @@ Content-Type: application/json "value": 0.0 }, { + "name": "master/messages_reconcile_operations", + "value": 0.0 + }, + { "name": "master/messages_reconcile_tasks", "value": 0.0 }, http://git-wip-us.apache.org/repos/asf/mesos/blob/c7c38483/src/master/metrics.cpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.cpp b/src/master/metrics.cpp index 894c041..4cc96a1 100644 --- a/src/master/metrics.cpp +++ b/src/master/metrics.cpp @@ -129,6 +129,8 @@ Metrics::Metrics(const Master& master) "master/messages_revive_offers"), messages_suppress_offers( "master/messages_suppress_offers"), + messages_reconcile_operations( + "master/messages_reconcile_operations"), messages_reconcile_tasks( "master/messages_reconcile_tasks"), messages_framework_to_executor( @@ -253,6 +255,7 @@ Metrics::Metrics(const Master& master) process::metrics::add(messages_decline_offers); process::metrics::add(messages_revive_offers); process::metrics::add(messages_suppress_offers); + process::metrics::add(messages_reconcile_operations); process::metrics::add(messages_reconcile_tasks); process::metrics::add(messages_framework_to_executor); process::metrics::add(messages_executor_to_framework); @@ -403,6 +406,7 @@ Metrics::~Metrics() process::metrics::remove(messages_decline_offers); process::metrics::remove(messages_revive_offers); process::metrics::remove(messages_suppress_offers); + process::metrics::remove(messages_reconcile_operations); 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/c7c38483/src/master/metrics.hpp ---------------------------------------------------------------------- diff --git a/src/master/metrics.hpp b/src/master/metrics.hpp index 5699c64..5414c47 100644 --- a/src/master/metrics.hpp +++ b/src/master/metrics.hpp @@ -135,6 +135,7 @@ struct Metrics process::metrics::Counter messages_decline_offers; process::metrics::Counter messages_revive_offers; process::metrics::Counter messages_suppress_offers; + process::metrics::Counter messages_reconcile_operations; process::metrics::Counter messages_reconcile_tasks; process::metrics::Counter messages_framework_to_executor; process::metrics::Counter messages_operation_status_update_acknowledgement; http://git-wip-us.apache.org/repos/asf/mesos/blob/c7c38483/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index be7a3cc..d5ce52c 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -2268,6 +2268,7 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) 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_suppress_offers")); + EXPECT_EQ(1u, snapshot.values.count("master/messages_reconcile_operations")); EXPECT_EQ(1u, snapshot.values.count("master/messages_reconcile_tasks")); EXPECT_EQ(1u, snapshot.values.count("master/messages_framework_to_executor"));
