Added missing metrics to tests. Review: https://reviews.apache.org/r/61033/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/88eb71d0 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/88eb71d0 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/88eb71d0 Branch: refs/heads/master Commit: 88eb71d0f8d8aa74d662d68261c01ef8fa2d84e6 Parents: d9de5ef Author: Alexander Rukletsov <ruklet...@gmail.com> Authored: Fri Aug 4 12:21:22 2017 +0200 Committer: Alexander Rukletsov <al...@apache.org> Committed: Fri Aug 4 12:21:22 2017 +0200 ---------------------------------------------------------------------- src/tests/master_tests.cpp | 33 +++++++++++++++++++++++++++++++++ src/tests/slave_tests.cpp | 17 +++++++++++++++++ 2 files changed, 50 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/88eb71d0/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index 3fcd72b..e6ed02e 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -2231,6 +2231,7 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("master/slaves_disconnected")); EXPECT_EQ(1u, snapshot.values.count("master/slaves_active")); EXPECT_EQ(1u, snapshot.values.count("master/slaves_inactive")); + EXPECT_EQ(1u, snapshot.values.count("master/slaves_unreachable")); EXPECT_EQ(1u, snapshot.values.count("master/frameworks_connected")); EXPECT_EQ(1u, snapshot.values.count("master/frameworks_disconnected")); @@ -2242,12 +2243,16 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("master/tasks_staging")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_starting")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_running")); + EXPECT_EQ(1u, snapshot.values.count("master/tasks_unreachable")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_killing")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_finished")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_failed")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_killed")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_lost")); EXPECT_EQ(1u, snapshot.values.count("master/tasks_error")); + EXPECT_EQ(1u, snapshot.values.count("master/tasks_dropped")); + EXPECT_EQ(1u, snapshot.values.count("master/tasks_gone")); + EXPECT_EQ(1u, snapshot.values.count("master/tasks_gone_by_operator")); EXPECT_EQ(1u, snapshot.values.count("master/dropped_messages")); @@ -2276,6 +2281,7 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("master/messages_unregister_slave")); EXPECT_EQ(1u, snapshot.values.count("master/messages_status_update")); EXPECT_EQ(1u, snapshot.values.count("master/messages_exited_executor")); + EXPECT_EQ(1u, snapshot.values.count("master/messages_update_slave")); // Messages from both schedulers and slaves. EXPECT_EQ(1u, snapshot.values.count("master/messages_authenticate")); @@ -2284,6 +2290,10 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) "master/valid_framework_to_executor_messages")); EXPECT_EQ(1u, snapshot.values.count( "master/invalid_framework_to_executor_messages")); + EXPECT_EQ(1u, snapshot.values.count( + "master/valid_executor_to_framework_messages")); + EXPECT_EQ(1u, snapshot.values.count( + "master/invalid_executor_to_framework_messages")); EXPECT_EQ(1u, snapshot.values.count("master/valid_status_updates")); EXPECT_EQ(1u, snapshot.values.count("master/invalid_status_updates")); @@ -2293,28 +2303,51 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count( "master/invalid_status_update_acknowledgements")); + // Recovery counters. EXPECT_EQ(1u, snapshot.values.count("master/recovery_slave_removals")); + // Process metrics. EXPECT_EQ(1u, snapshot.values.count("master/event_queue_messages")); EXPECT_EQ(1u, snapshot.values.count("master/event_queue_dispatches")); EXPECT_EQ(1u, snapshot.values.count("master/event_queue_http_requests")); + // Slave observer metrics. + EXPECT_EQ(1u, snapshot.values.count("master/slave_unreachable_scheduled")); + EXPECT_EQ(1u, snapshot.values.count("master/slave_unreachable_completed")); + EXPECT_EQ(1u, snapshot.values.count("master/slave_unreachable_canceled")); + EXPECT_EQ(1u, snapshot.values.count("master/cpus_total")); EXPECT_EQ(1u, snapshot.values.count("master/cpus_used")); EXPECT_EQ(1u, snapshot.values.count("master/cpus_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/cpus_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("master/cpus_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("master/cpus_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/gpus_total")); EXPECT_EQ(1u, snapshot.values.count("master/gpus_used")); EXPECT_EQ(1u, snapshot.values.count("master/gpus_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/gpus_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("master/gpus_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("master/gpus_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/mem_total")); EXPECT_EQ(1u, snapshot.values.count("master/mem_used")); EXPECT_EQ(1u, snapshot.values.count("master/mem_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/mem_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("master/mem_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("master/mem_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/disk_total")); EXPECT_EQ(1u, snapshot.values.count("master/disk_used")); EXPECT_EQ(1u, snapshot.values.count("master/disk_percent")); + EXPECT_EQ(1u, snapshot.values.count("master/disk_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("master/disk_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("master/disk_revocable_percent")); + // Registrar Metrics. EXPECT_EQ(1u, snapshot.values.count("registrar/queued_operations")); EXPECT_EQ(1u, snapshot.values.count("registrar/registry_size_bytes")); http://git-wip-us.apache.org/repos/asf/mesos/blob/88eb71d0/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index c55a425..14251b8 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -1349,6 +1349,7 @@ TEST_F(SlaveTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("slave/tasks_failed")); EXPECT_EQ(1u, snapshot.values.count("slave/tasks_killed")); EXPECT_EQ(1u, snapshot.values.count("slave/tasks_lost")); + EXPECT_EQ(1u, snapshot.values.count("slave/tasks_gone")); EXPECT_EQ(1u, snapshot.values.count("slave/executors_registering")); EXPECT_EQ(1u, snapshot.values.count("slave/executors_running")); @@ -1372,17 +1373,33 @@ TEST_F(SlaveTest, MetricsInMetricsEndpoint) EXPECT_EQ(1u, snapshot.values.count("slave/cpus_used")); EXPECT_EQ(1u, snapshot.values.count("slave/cpus_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/cpus_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("slave/cpus_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("slave/cpus_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/gpus_total")); EXPECT_EQ(1u, snapshot.values.count("slave/gpus_used")); EXPECT_EQ(1u, snapshot.values.count("slave/gpus_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/gpus_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("slave/gpus_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("slave/gpus_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/mem_total")); EXPECT_EQ(1u, snapshot.values.count("slave/mem_used")); EXPECT_EQ(1u, snapshot.values.count("slave/mem_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/mem_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("slave/mem_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("slave/mem_revocable_percent")); + EXPECT_EQ(1u, snapshot.values.count("slave/disk_total")); EXPECT_EQ(1u, snapshot.values.count("slave/disk_used")); EXPECT_EQ(1u, snapshot.values.count("slave/disk_percent")); + + EXPECT_EQ(1u, snapshot.values.count("slave/disk_revocable_total")); + EXPECT_EQ(1u, snapshot.values.count("slave/disk_revocable_used")); + EXPECT_EQ(1u, snapshot.values.count("slave/disk_revocable_percent")); }
