Make statsd key look like the keys from shade

openstacksdk produces task names that look like compute.DELETE.servers,
which are {service_type}.{METHOD}.{url}.{parts} but shade and nodepool
have been reporting to statsd with {Service_type}{Method}{Url}{Parts}.

Translate the task.name produced by sdk into the key nodepool expects to
report as.

Also, emit 'Manager ran task' log lines

The super class emits these, but on the openstacksdk logger. We don't
really want to turn that on at debug level for normal usage, so rather
than calling super(post_run_task) just straight-up override it.

Make sure we log using the transformed name in all cases.

Change-Id: I7f21aefc204366f7621643fdba76b7e70ce4caf5
This commit is contained in:
Monty Taylor 2018-07-24 09:51:27 -05:00
parent 60bf606db4
commit 67824d8e64
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 17 additions and 3 deletions

View File

@ -26,6 +26,14 @@ from openstack import task_manager as openstack_task_manager
from nodepool import stats
def _transform_task_name(task_name):
# openstacksdk sets task.name to something like "compute.DELETE.servers"
# We want ComputeDeleteServers
return "".join(
[part.lower().capitalize() for part in task_name.split('.')]
)
class ManagerStoppedException(Exception):
pass
@ -68,7 +76,9 @@ class TaskManager(openstack_task_manager.TaskManager):
break
time.sleep(self.rate - delta)
self.log.debug("Manager %s running task %s (queue %s)" %
(self.name, task.name, self.queue.qsize()))
(self.name,
_transform_task_name(task.name),
self.queue.qsize()))
self.run_task(task)
self.queue.task_done()
except Exception:
@ -76,10 +86,14 @@ class TaskManager(openstack_task_manager.TaskManager):
raise
def post_run_task(self, elapsed_time, task):
super(TaskManager, self).post_run_task(elapsed_time, task)
task_name = _transform_task_name(task.name)
self.log.debug(
"Manager %s ran task %s in %ss" %
(self.name, task_name, elapsed_time))
if self.statsd:
# nodepool.task.PROVIDER.TASK_NAME
key = 'nodepool.task.%s.%s' % (self.name, task.name)
key = 'nodepool.task.%s.%s' % (self.name, task_name)
self.statsd.timing(key, int(elapsed_time * 1000))
self.statsd.incr(key)