You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by ta...@apache.org on 2018/05/07 22:01:05 UTC

[2/3] impala git commit: Move admission-controller and catalog metrics into own groups

Move admission-controller and catalog metrics into own groups

This makes using these metrics a lot easier since they're not mixed
into the big impala-metrics group.

Testing:
Checked /metrics debug page to see that all metrics were now in a
separate section

Change-Id: I17dbbcebc01cc1f5b8e94e593873cdc3dc5e36df
Reviewed-on: http://gerrit.cloudera.org:8080/10302
Reviewed-by: Sailesh Mukil <sa...@cloudera.com>
Reviewed-by: Philip Zeyliger <ph...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/14f6c242
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/14f6c242
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/14f6c242

Branch: refs/heads/master
Commit: 14f6c242f21eca3c73bc3b4fa45c8d90ebcdd571
Parents: f1709a6
Author: Tim Armstrong <ta...@cloudera.com>
Authored: Thu May 3 16:24:28 2018 -0700
Committer: Impala Public Jenkins <im...@cloudera.com>
Committed: Mon May 7 20:19:00 2018 +0000

----------------------------------------------------------------------
 be/src/scheduling/admission-controller.cc |  2 +-
 be/src/util/impalad-metrics.cc            | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/impala/blob/14f6c242/be/src/scheduling/admission-controller.cc
----------------------------------------------------------------------
diff --git a/be/src/scheduling/admission-controller.cc b/be/src/scheduling/admission-controller.cc
index 7cdcd02..48f5e3b 100644
--- a/be/src/scheduling/admission-controller.cc
+++ b/be/src/scheduling/admission-controller.cc
@@ -213,7 +213,7 @@ AdmissionController::AdmissionController(StatestoreSubscriber* subscriber,
     const TNetworkAddress& host_addr)
     : subscriber_(subscriber),
       request_pool_service_(request_pool_service),
-      metrics_group_(metrics),
+      metrics_group_(metrics->GetOrCreateChildGroup("admission-controller")),
       host_id_(TNetworkAddressToString(host_addr)),
       thrift_serializer_(false),
       done_(false) {}

http://git-wip-us.apache.org/repos/asf/impala/blob/14f6c242/be/src/util/impalad-metrics.cc
----------------------------------------------------------------------
diff --git a/be/src/util/impalad-metrics.cc b/be/src/util/impalad-metrics.cc
index 815e4af..b8bb90c 100644
--- a/be/src/util/impalad-metrics.cc
+++ b/be/src/util/impalad-metrics.cc
@@ -236,12 +236,17 @@ void ImpaladMetrics::CreateMetrics(MetricGroup* m) {
       ImpaladMetricKeys::IO_MGR_CACHED_FILE_HANDLES_HIT_RATIO);
 
   // Initialize catalog metrics
-  CATALOG_NUM_DBS = m->AddGauge(ImpaladMetricKeys::CATALOG_NUM_DBS, 0);
-  CATALOG_NUM_TABLES = m->AddGauge(ImpaladMetricKeys::CATALOG_NUM_TABLES, 0);
-  CATALOG_VERSION = m->AddGauge(ImpaladMetricKeys::CATALOG_VERSION, 0);
-  CATALOG_TOPIC_VERSION = m->AddGauge(ImpaladMetricKeys::CATALOG_TOPIC_VERSION, 0);
-  CATALOG_SERVICE_ID = m->AddProperty<string>(ImpaladMetricKeys::CATALOG_SERVICE_ID, "");
-  CATALOG_READY = m->AddProperty<bool>(ImpaladMetricKeys::CATALOG_READY, false);
+  MetricGroup* catalog_metrics = m->GetOrCreateChildGroup("catalog");
+  CATALOG_NUM_DBS = catalog_metrics->AddGauge(ImpaladMetricKeys::CATALOG_NUM_DBS, 0);
+  CATALOG_NUM_TABLES =
+      catalog_metrics->AddGauge(ImpaladMetricKeys::CATALOG_NUM_TABLES, 0);
+  CATALOG_VERSION = catalog_metrics->AddGauge(ImpaladMetricKeys::CATALOG_VERSION, 0);
+  CATALOG_TOPIC_VERSION =
+      catalog_metrics->AddGauge(ImpaladMetricKeys::CATALOG_TOPIC_VERSION, 0);
+  CATALOG_SERVICE_ID =
+      catalog_metrics->AddProperty<string>(ImpaladMetricKeys::CATALOG_SERVICE_ID, "");
+  CATALOG_READY =
+      catalog_metrics->AddProperty<bool>(ImpaladMetricKeys::CATALOG_READY, false);
 
   // Maximum duration to be tracked by the query durations metric. No particular reasoning
   // behind five hours, except to say that there's some threshold beyond which queries