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

diff --git a/cinder/service.py b/cinder/service.py
index 4c435c6550dddce737b968f3490882f53d8700e4..08ca100d570b70b629fdae73de18f54d5cb9279d 100644 (file)
--- 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 cfd466dfc0a3b8f336f693e00919fe6727f0677e..f78ac4d4476047ebe2f1bf9af91df416a9d97a98 100644 (file)
--- 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)