Merge ~cgrabowski/maas:add_rpc_conn_pool_metric into maas:master

Proposed by Christian Grabowski
Status: Merged
Approved by: Christian Grabowski
Approved revision: ecff69b7c7dc52bb947ef85f40dc7e6f4c2f66d4
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~cgrabowski/maas:add_rpc_conn_pool_metric
Merge into: maas:master
Diff against target: 40 lines (+11/-0)
2 files modified
src/provisioningserver/prometheus/metrics.py (+9/-0)
src/provisioningserver/rpc/connectionpool.py (+2/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Anton Troyanov Approve
Alexsander de Souza Approve
Review via email: mp+429985@code.launchpad.net

Commit message

add metric counting number of times RPC pool scales to max size

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b add_rpc_conn_pool_metric lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/634/consoleText
COMMIT: 49c5020e79abb31fe768ee724186659b7c0dcfe6

review: Needs Fixing
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b add_rpc_conn_pool_metric lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/636/consoleText
COMMIT: 72e51acb143aefc89da985a09083eefe5c37e0fb

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b add_rpc_conn_pool_metric lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/648/consoleText
COMMIT: ecff69b7c7dc52bb947ef85f40dc7e6f4c2f66d4

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

+1

review: Approve
Revision history for this message
Christian Grabowski (cgrabowski) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b add_rpc_conn_pool_metric lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ecff69b7c7dc52bb947ef85f40dc7e6f4c2f66d4

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b add_rpc_conn_pool_metric lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/674/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/provisioningserver/prometheus/metrics.py b/src/provisioningserver/prometheus/metrics.py
index 8f117ff..bc2e6bb 100644
--- a/src/provisioningserver/prometheus/metrics.py
+++ b/src/provisioningserver/prometheus/metrics.py
@@ -108,6 +108,15 @@ METRICS_DEFINITIONS = [
108 "maas_lxd_fetch_machine_failure",108 "maas_lxd_fetch_machine_failure",
109 "failures for fetching LXD machines",109 "failures for fetching LXD machines",
110 ),110 ),
111 MetricDefinition(
112 "Counter",
113 "maas_rpc_pool_exhaustion_count",
114 """
115 counts the number of occurances of the RPC
116 connection pool allocate its maxmimum number
117 of connections
118 """,
119 ),
111 # Common metrics120 # Common metrics
112 *node_metrics_definitions(),121 *node_metrics_definitions(),
113]122]
diff --git a/src/provisioningserver/rpc/connectionpool.py b/src/provisioningserver/rpc/connectionpool.py
index 3acaf08..55b00cb 100644
--- a/src/provisioningserver/rpc/connectionpool.py
+++ b/src/provisioningserver/rpc/connectionpool.py
@@ -8,6 +8,7 @@ import random
8from twisted.internet.defer import inlineCallbacks8from twisted.internet.defer import inlineCallbacks
9from twisted.internet.endpoints import connectProtocol, TCP6ClientEndpoint9from twisted.internet.endpoints import connectProtocol, TCP6ClientEndpoint
1010
11from provisioningserver.prometheus.metrics import PROMETHEUS_METRICS
11from provisioningserver.rpc import exceptions12from provisioningserver.rpc import exceptions
1213
1314
@@ -80,6 +81,7 @@ class ConnectionPool:
80 def stage_connection(self, eventloop, connection):81 def stage_connection(self, eventloop, connection):
81 self.try_connections[eventloop] = connection82 self.try_connections[eventloop] = connection
8283
84 @PROMETHEUS_METRICS.failure_counter("maas_rpc_pool_exhaustion_count")
83 @inlineCallbacks85 @inlineCallbacks
84 def scale_up_connections(self):86 def scale_up_connections(self):
85 for ev, ev_conns in self.connections.items():87 for ev, ev_conns in self.connections.items():

Subscribers

People subscribed via source and target branches