You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/04/08 23:20:01 UTC
[2/5] mesos git commit: Added master and agent metrics for GPU
resources.
Added master and agent metrics for GPU resources.
Review: https://reviews.apache.org/r/45852/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b75f5657
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b75f5657
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b75f5657
Branch: refs/heads/master
Commit: b75f5657fe8bfe666ebfa4177ef94f8073fb41a5
Parents: cce8dd8
Author: Kevin Klues <kl...@gmail.com>
Authored: Fri Apr 8 13:59:42 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Fri Apr 8 13:59:42 2016 -0700
----------------------------------------------------------------------
src/master/metrics.cpp | 2 +-
src/slave/metrics.cpp | 2 +-
src/tests/master_tests.cpp | 4 ++++
src/tests/slave_tests.cpp | 4 ++++
4 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b75f5657/src/master/metrics.cpp
----------------------------------------------------------------------
diff --git a/src/master/metrics.cpp b/src/master/metrics.cpp
index 30c0911..88a752d 100644
--- a/src/master/metrics.cpp
+++ b/src/master/metrics.cpp
@@ -270,7 +270,7 @@ Metrics::Metrics(const Master& master)
// Create resource gauges.
// TODO(dhamon): Set these up dynamically when adding a slave based on the
// resources the slave exposes.
- const string resources[] = {"cpus", "mem", "disk"};
+ const string resources[] = {"cpus", "gpus", "mem", "disk"};
foreach (const string& resource, resources) {
Gauge total(
http://git-wip-us.apache.org/repos/asf/mesos/blob/b75f5657/src/slave/metrics.cpp
----------------------------------------------------------------------
diff --git a/src/slave/metrics.cpp b/src/slave/metrics.cpp
index 42c66d7..86eb8db 100644
--- a/src/slave/metrics.cpp
+++ b/src/slave/metrics.cpp
@@ -127,7 +127,7 @@ Metrics::Metrics(const Slave& slave)
// Create resource gauges.
// TODO(dhamon): Set these up dynamically when creating a slave
// based on the resources it exposes.
- const string resources[] = {"cpus", "mem", "disk"};
+ const string resources[] = {"cpus", "gpus", "mem", "disk"};
foreach (const string& resource, resources) {
Gauge total(
http://git-wip-us.apache.org/repos/asf/mesos/blob/b75f5657/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 8f93fba..a5b21d3 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -1616,6 +1616,10 @@ TEST_F(MasterTest, MetricsInMetricsEndpoint)
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/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/mem_total"));
EXPECT_EQ(1u, snapshot.values.count("master/mem_used"));
EXPECT_EQ(1u, snapshot.values.count("master/mem_percent"));
http://git-wip-us.apache.org/repos/asf/mesos/blob/b75f5657/src/tests/slave_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp
index 03bb6da..4a576b9 100644
--- a/src/tests/slave_tests.cpp
+++ b/src/tests/slave_tests.cpp
@@ -1189,6 +1189,10 @@ 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/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/mem_total"));
EXPECT_EQ(1u, snapshot.values.count("slave/mem_used"));
EXPECT_EQ(1u, snapshot.values.count("slave/mem_percent"));