You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by to...@apache.org on 2016/01/11 10:19:14 UTC
[8/8] incubator-kudu git commit: Add CPU usage and context switch
metrics
Add CPU usage and context switch metrics
CPU usage and context switch are important metrics for a backend
service. The commit collect those metrics using getrusage.
Change-Id: Ic28f4813999c6cf9af6781cdfba9097bc05727e0
Reviewed-on: http://gerrit.cloudera.org:8080/1751
Reviewed-by: Todd Lipcon <to...@cloudera.com>
Tested-by: Internal Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/ad994337
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/ad994337
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/ad994337
Branch: refs/heads/master
Commit: ad9943376c0435d39968f8ea8840070de1a988b4
Parents: d4de1cd
Author: Binglin Chang <de...@gmail.com>
Authored: Fri Jan 8 11:45:27 2016 +0800
Committer: Todd Lipcon <to...@cloudera.com>
Committed: Mon Jan 11 09:18:49 2016 +0000
----------------------------------------------------------------------
src/kudu/util/metrics.cc | 2 ++
src/kudu/util/metrics.h | 1 +
src/kudu/util/thread.cc | 62 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/ad994337/src/kudu/util/metrics.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/metrics.cc b/src/kudu/util/metrics.cc
index 7406f7b..3c8c66a 100644
--- a/src/kudu/util/metrics.cc
+++ b/src/kudu/util/metrics.cc
@@ -105,6 +105,8 @@ const char* MetricUnit::Name(Type unit) {
return "tasks";
case kMessages:
return "messages";
+ case kContextSwitches:
+ return "context switches";
default:
return "UNKNOWN UNIT";
}
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/ad994337/src/kudu/util/metrics.h
----------------------------------------------------------------------
diff --git a/src/kudu/util/metrics.h b/src/kudu/util/metrics.h
index 58aeab3..4475f8c 100644
--- a/src/kudu/util/metrics.h
+++ b/src/kudu/util/metrics.h
@@ -377,6 +377,7 @@ struct MetricUnit {
kLogBlockContainers,
kTasks,
kMessages,
+ kContextSwitches,
};
static const char* Name(Type unit);
};
http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/ad994337/src/kudu/util/thread.cc
----------------------------------------------------------------------
diff --git a/src/kudu/util/thread.cc b/src/kudu/util/thread.cc
index deb57d3..701be68 100644
--- a/src/kudu/util/thread.cc
+++ b/src/kudu/util/thread.cc
@@ -23,7 +23,9 @@
#include <boost/foreach.hpp>
#include <map>
#include <set>
+#include <sys/resource.h>
#include <sys/syscall.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <tr1/memory>
#include <unistd.h>
@@ -67,8 +69,56 @@ METRIC_DEFINE_gauge_uint64(server, threads_running,
kudu::MetricUnit::kThreads,
"Current number of running threads");
+METRIC_DEFINE_gauge_uint64(server, cpu_utime,
+ "User CPU Time",
+ kudu::MetricUnit::kMilliseconds,
+ "Total user CPU time of the process",
+ kudu::EXPOSE_AS_COUNTER);
+
+METRIC_DEFINE_gauge_uint64(server, cpu_stime,
+ "System CPU Time",
+ kudu::MetricUnit::kMilliseconds,
+ "Total system CPU time of the process",
+ kudu::EXPOSE_AS_COUNTER);
+
+METRIC_DEFINE_gauge_uint64(server, voluntary_context_switches,
+ "Voluntary Context Switches",
+ kudu::MetricUnit::kContextSwitches,
+ "Total voluntary context switches",
+ kudu::EXPOSE_AS_COUNTER);
+
+METRIC_DEFINE_gauge_uint64(server, involuntary_context_switches,
+ "Involuntary Context Switches",
+ kudu::MetricUnit::kContextSwitches,
+ "Total involuntary context switches",
+ kudu::EXPOSE_AS_COUNTER);
+
namespace kudu {
+static uint64_t GetCpuUTime() {
+ rusage ru;
+ CHECK_ERR(getrusage(RUSAGE_SELF, &ru));
+ return ru.ru_utime.tv_sec * 1000UL + ru.ru_utime.tv_usec / 1000UL;
+}
+
+static uint64_t GetCpuSTime() {
+ rusage ru;
+ CHECK_ERR(getrusage(RUSAGE_SELF, &ru));
+ return ru.ru_stime.tv_sec * 1000UL + ru.ru_stime.tv_usec / 1000UL;
+}
+
+static uint64_t GetVoluntaryContextSwitches() {
+ rusage ru;
+ CHECK_ERR(getrusage(RUSAGE_SELF, &ru));
+ return ru.ru_nvcsw;;
+}
+
+static uint64_t GetInVoluntaryContextSwitches() {
+ rusage ru;
+ CHECK_ERR(getrusage(RUSAGE_SELF, &ru));
+ return ru.ru_nivcsw;
+}
+
class ThreadMgr;
__thread Thread* Thread::tls_ = NULL;
@@ -201,6 +251,18 @@ Status ThreadMgr::StartInstrumentation(const scoped_refptr<MetricEntity>& metric
metrics->NeverRetire(
METRIC_threads_running.InstantiateFunctionGauge(metrics,
Bind(&ThreadMgr::ReadThreadsRunning, Unretained(this))));
+ metrics->NeverRetire(
+ METRIC_cpu_utime.InstantiateFunctionGauge(metrics,
+ Bind(&GetCpuUTime)));
+ metrics->NeverRetire(
+ METRIC_cpu_stime.InstantiateFunctionGauge(metrics,
+ Bind(&GetCpuSTime)));
+ metrics->NeverRetire(
+ METRIC_voluntary_context_switches.InstantiateFunctionGauge(metrics,
+ Bind(&GetVoluntaryContextSwitches)));
+ metrics->NeverRetire(
+ METRIC_involuntary_context_switches.InstantiateFunctionGauge(metrics,
+ Bind(&GetInVoluntaryContextSwitches)));
WebCallbackRegistry::PathHandlerCallback thread_callback =
bind<void>(mem_fn(&ThreadMgr::ThreadPathHandler), this, _1, _2);