You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by zh...@apache.org on 2018/06/21 04:56:44 UTC
[3/3] mesos git commit: Added an hourly timer for
`containerizer/docker/image_pull`.
Added an hourly timer for `containerizer/docker/image_pull`.
Review: https://reviews.apache.org/r/53105/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/68d96ad7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/68d96ad7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/68d96ad7
Branch: refs/heads/master
Commit: 68d96ad76f9b26217fa7e0bc19f9177398e85e21
Parents: 7954729
Author: Zhitao Li <zh...@gmail.com>
Authored: Wed Jun 20 10:24:42 2018 -0700
Committer: Zhitao Li <zh...@gmail.com>
Committed: Wed Jun 20 21:52:18 2018 -0700
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 8 ++++----
src/slave/containerizer/docker.hpp | 21 +++++++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/68d96ad7/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index f83036a..7737107 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -445,10 +445,10 @@ Future<Nothing> DockerContainerizerProcess::pull(
string image = container->image();
- Future<Docker::Image> future = docker->pull(
- container->containerWorkDir,
- image,
- container->forcePullImage());
+ Future<Docker::Image> future = metrics.image_pull.time(docker->pull(
+ container->containerWorkDir,
+ image,
+ container->forcePullImage()));
containers_.at(containerId)->pull = future;
http://git-wip-us.apache.org/repos/asf/mesos/blob/68d96ad7/src/slave/containerizer/docker.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.hpp b/src/slave/containerizer/docker.hpp
index 1ed47c8..438d96a 100644
--- a/src/slave/containerizer/docker.hpp
+++ b/src/slave/containerizer/docker.hpp
@@ -26,6 +26,10 @@
#include <process/owned.hpp>
#include <process/shared.hpp>
+#include <process/metrics/metrics.hpp>
+#include <process/metrics/timer.hpp>
+
+#include <stout/duration.hpp>
#include <stout/flags.hpp>
#include <stout/hashset.hpp>
@@ -170,6 +174,21 @@ public:
virtual process::Future<hashset<ContainerID>> containers();
private:
+ struct Metrics
+ {
+ Metrics() : image_pull("containerizer/docker/image_pull", Hours(1))
+ {
+ process::metrics::add(image_pull);
+ }
+
+ ~Metrics()
+ {
+ process::metrics::remove(image_pull);
+ }
+
+ process::metrics::Timer<Milliseconds> image_pull;
+ };
+
// Continuations and helpers.
process::Future<Nothing> _fetch(
const ContainerID& containerId,
@@ -293,6 +312,8 @@ private:
Option<NvidiaComponents> nvidia;
+ Metrics metrics;
+
struct Container
{
static Try<Container*> create(