From c79748c4ac05555e1c6292af40e28a5869aab879 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Wed, 10 Feb 2016 14:16:17 -0500 Subject: [PATCH] Profiler: don't call trace_cls if profiler is not enabled If the profiler is disabled, don't call methods to setup tracing. Change-Id: I5573eab9458946c1cb2fc49792de2c64b5967cd2 --- cinder/service.py | 3 ++- cinder/volume/manager.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cinder/service.py b/cinder/service.py index 4c435c655..08ca100d5 100644 --- a/cinder/service.py +++ b/cinder/service.py @@ -125,7 +125,8 @@ class Service(service.Service): self.topic = topic self.manager_class_name = manager manager_class = importutils.import_class(self.manager_class_name) - manager_class = profiler.trace_cls("rpc")(manager_class) + if CONF.profiler.profiler_enabled: + manager_class = profiler.trace_cls("rpc")(manager_class) self.manager = manager_class(host=self.host, service_name=service_name, diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index cfd466dfc..f78ac4d44 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -238,7 +238,8 @@ class VolumeManager(manager.SchedulerDependentManager): host=self.host, is_vol_db_empty=vol_db_empty) - self.driver = profiler.trace_cls("driver")(self.driver) + if CONF.profiler.profiler_enabled: + self.driver = profiler.trace_cls("driver")(self.driver) try: self.extra_capabilities = jsonutils.loads( self.driver.configuration.extra_capabilities) -- 2.45.2