You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2017/07/28 14:43:09 UTC
[2/2] mesos git commit: Removed almost identical master and slave
metrics tests.
Removed almost identical master and slave metrics tests.
Review: https://reviews.apache.org/r/61031/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/155285d3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/155285d3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/155285d3
Branch: refs/heads/master
Commit: 155285d3d5815aacda4d8fcc1c02c58ddb572a31
Parents: ff24bea
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Fri Jul 28 16:42:21 2017 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Fri Jul 28 16:42:21 2017 +0200
----------------------------------------------------------------------
src/tests/master_tests.cpp | 2 +
src/tests/metrics_tests.cpp | 180 ---------------------------------------
src/tests/slave_tests.cpp | 1 +
3 files changed, 3 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/155285d3/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index e3ccf8c..3fcd72b 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -2242,10 +2242,12 @@ 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_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/dropped_messages"));
http://git-wip-us.apache.org/repos/asf/mesos/blob/155285d3/src/tests/metrics_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/metrics_tests.cpp b/src/tests/metrics_tests.cpp
index a4d0e31..55065cd 100644
--- a/src/tests/metrics_tests.cpp
+++ b/src/tests/metrics_tests.cpp
@@ -88,186 +88,6 @@ private:
};
-TEST_F(MetricsTest, Master)
-{
- Try<Owned<cluster::Master>> master = StartMaster();
- ASSERT_SOME(master);
-
- // Get the snapshot.
- process::UPID upid("metrics", process::address());
-
- process::Future<process::http::Response> response =
- process::http::get(upid, "snapshot");
-
- AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response);
- AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
-
- Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
- ASSERT_SOME(parse);
-
- JSON::Object stats = parse.get();
-
- EXPECT_EQ(1u, stats.values.count("master/uptime_secs"));
-
- EXPECT_EQ(1u, stats.values.count("master/elected"));
-
- EXPECT_EQ(1u, stats.values.count("master/slaves_connected"));
- EXPECT_EQ(1u, stats.values.count("master/slaves_disconnected"));
- 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/frameworks_connected"));
- EXPECT_EQ(1u, stats.values.count("master/frameworks_disconnected"));
- 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"));
-
- EXPECT_EQ(1u, stats.values.count("master/tasks_staging"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_starting"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_running"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_killing"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_finished"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_failed"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_killed"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_lost"));
- EXPECT_EQ(1u, stats.values.count("master/tasks_error"));
-
- EXPECT_EQ(1u, stats.values.count("master/dropped_messages"));
-
- // Messages from schedulers.
- EXPECT_EQ(1u, stats.values.count("master/messages_register_framework"));
- EXPECT_EQ(1u, stats.values.count("master/messages_reregister_framework"));
- EXPECT_EQ(1u, stats.values.count("master/messages_unregister_framework"));
- EXPECT_EQ(1u, stats.values.count("master/messages_deactivate_framework"));
- EXPECT_EQ(1u, stats.values.count("master/messages_kill_task"));
- EXPECT_EQ(1u, stats.values.count(
- "master/messages_status_update_acknowledgement"));
- EXPECT_EQ(1u, stats.values.count("master/messages_resource_request"));
- 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_suppress_offers"));
- EXPECT_EQ(1u, stats.values.count("master/messages_reconcile_tasks"));
- EXPECT_EQ(1u, stats.values.count("master/messages_framework_to_executor"));
-
- // Messages from slaves.
- EXPECT_EQ(1u, stats.values.count("master/messages_register_slave"));
- EXPECT_EQ(1u, stats.values.count("master/messages_reregister_slave"));
- EXPECT_EQ(1u, stats.values.count("master/messages_unregister_slave"));
- EXPECT_EQ(1u, stats.values.count("master/messages_status_update"));
- EXPECT_EQ(1u, stats.values.count("master/messages_exited_executor"));
-
- // Messages from both schedulers and slaves.
- EXPECT_EQ(1u, stats.values.count("master/messages_authenticate"));
-
- EXPECT_EQ(1u, stats.values.count(
- "master/valid_framework_to_executor_messages"));
- EXPECT_EQ(1u, stats.values.count(
- "master/invalid_framework_to_executor_messages"));
-
- EXPECT_EQ(1u, stats.values.count("master/valid_status_updates"));
- EXPECT_EQ(1u, stats.values.count("master/invalid_status_updates"));
-
- EXPECT_EQ(1u, stats.values.count(
- "master/valid_status_update_acknowledgements"));
- EXPECT_EQ(1u, stats.values.count(
- "master/invalid_status_update_acknowledgements"));
-
- EXPECT_EQ(1u, stats.values.count("master/recovery_slave_removals"));
-
- 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"));
- EXPECT_EQ(1u, stats.values.count("master/cpus_percent"));
-
- EXPECT_EQ(1u, stats.values.count("master/mem_total"));
- EXPECT_EQ(1u, stats.values.count("master/mem_used"));
- EXPECT_EQ(1u, stats.values.count("master/mem_percent"));
-
- EXPECT_EQ(1u, stats.values.count("master/disk_total"));
- EXPECT_EQ(1u, stats.values.count("master/disk_used"));
- EXPECT_EQ(1u, stats.values.count("master/disk_percent"));
-
- EXPECT_EQ(1u, stats.values.count("registrar/queued_operations"));
- EXPECT_EQ(1u, stats.values.count("registrar/registry_size_bytes"));
-
- EXPECT_EQ(1u, stats.values.count("registrar/state_fetch_ms"));
- EXPECT_EQ(1u, stats.values.count("registrar/state_store_ms"));
-}
-
-
-TEST_F(MetricsTest, Slave)
-{
- // TODO(dhamon): https://issues.apache.org/jira/browse/MESOS-2134 to allow
- // only a Slave to be started.
- Try<Owned<cluster::Master>> master = StartMaster();
- ASSERT_SOME(master);
-
- Owned<MasterDetector> detector = master.get()->createDetector();
- Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
- ASSERT_SOME(slave);
-
- // Get the snapshot.
- process::UPID upid("metrics", process::address());
-
- process::Future<process::http::Response> response =
- process::http::get(upid, "snapshot");
-
- AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response);
- AWAIT_EXPECT_RESPONSE_HEADER_EQ(APPLICATION_JSON, "Content-Type", response);
-
- Try<JSON::Object> parse = JSON::parse<JSON::Object>(response->body);
- ASSERT_SOME(parse);
-
- JSON::Object stats = parse.get();
-
- EXPECT_EQ(1u, stats.values.count("slave/uptime_secs"));
- EXPECT_EQ(1u, stats.values.count("slave/registered"));
-
- EXPECT_EQ(1u, stats.values.count("slave/recovery_errors"));
-
- 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"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_running"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_killing"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_finished"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_failed"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_killed"));
- EXPECT_EQ(1u, stats.values.count("slave/tasks_lost"));
-
- EXPECT_EQ(1u, stats.values.count("slave/executors_registering"));
- EXPECT_EQ(1u, stats.values.count("slave/executors_running"));
- EXPECT_EQ(1u, stats.values.count("slave/executors_terminating"));
- EXPECT_EQ(1u, stats.values.count("slave/executors_terminated"));
-
- EXPECT_EQ(1u, stats.values.count("slave/valid_status_updates"));
- EXPECT_EQ(1u, stats.values.count("slave/invalid_status_updates"));
-
- EXPECT_EQ(1u, stats.values.count("slave/valid_framework_messages"));
- EXPECT_EQ(1u, stats.values.count("slave/invalid_framework_messages"));
-
- EXPECT_EQ(1u, stats.values.count("slave/container_launch_errors"));
-
- EXPECT_EQ(1u, stats.values.count("slave/cpus_total"));
- EXPECT_EQ(1u, stats.values.count("slave/cpus_used"));
- EXPECT_EQ(1u, stats.values.count("slave/cpus_percent"));
-
- EXPECT_EQ(1u, stats.values.count("slave/mem_total"));
- EXPECT_EQ(1u, stats.values.count("slave/mem_used"));
- EXPECT_EQ(1u, stats.values.count("slave/mem_percent"));
-
- EXPECT_EQ(1u, stats.values.count("slave/disk_total"));
- EXPECT_EQ(1u, stats.values.count("slave/disk_used"));
- EXPECT_EQ(1u, stats.values.count("slave/disk_percent"));
-}
-
-
// Tests that the `/metrics/snapshot` endpoint will reject unauthenticated
// requests when HTTP authentication is enabled on the master.
TEST_F(MetricsTest, MasterAuthenticationEnabled)
http://git-wip-us.apache.org/repos/asf/mesos/blob/155285d3/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index a089cc4..a8c3a77 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -1343,6 +1343,7 @@ TEST_F(SlaveTest, MetricsInMetricsEndpoint)
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_staging"));
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_starting"));
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_running"));
+ EXPECT_EQ(1u, snapshot.values.count("slave/tasks_killing"));
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_finished"));
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_failed"));
EXPECT_EQ(1u, snapshot.values.count("slave/tasks_killed"));