Disable osprofiler by default

This could cause issues when upgrading to juno, since if config files are not
updated osprofiler can crash.

It is disabled by default in other services, such as cinder and heat.

Change-Id: Ide1be0d42e9e3640560564005b2ce1ffdf554e25
Closes-Bug: #1387320
This commit is contained in:
Louis Taylor 2014-11-26 19:55:23 +00:00
parent 067b0db570
commit 090cb56ba1
4 changed files with 18 additions and 6 deletions

View File

@ -413,10 +413,10 @@ revocation_cache_time = 10
[profiler]
# If False fully disable profiling feature.
#enabled = True
#enabled = False
# If False doesn't trace SQL requests.
#trace_sqlalchemy = True
#trace_sqlalchemy = False
[task]
# ================= Glance Tasks Options ============================

View File

@ -238,7 +238,7 @@ admin_password = %SERVICE_PASSWORD%
[profiler]
# If False fully disable profiling feature.
#enabled = True
#enabled = False
# If False doesn't trace SQL requests.
#trace_sqlalchemy = True
#trace_sqlalchemy = False

View File

@ -88,9 +88,9 @@ eventlet_opts = [
]
profiler_opts = [
cfg.BoolOpt("enabled", default=True,
cfg.BoolOpt("enabled", default=False,
help=_('If False fully disable profiling feature.')),
cfg.BoolOpt("trace_sqlalchemy", default=True,
cfg.BoolOpt("trace_sqlalchemy", default=False,
help=_("If False doesn't trace SQL requests."))
]

View File

@ -97,3 +97,15 @@ class TestPasteApp(test_utils.BaseTestCase):
def test_get_path_non_exist(self):
self.assertRaises(RuntimeError, config._get_deployment_config_file)
class TestDefaultConfig(test_utils.BaseTestCase):
def setUp(self):
super(TestDefaultConfig, self).setUp()
self.CONF = config.cfg.CONF
self.CONF.import_group('profiler', 'glance.common.wsgi')
def test_osprofiler_disabled(self):
self.assertFalse(self.CONF.profiler.enabled)
self.assertFalse(self.CONF.profiler.trace_sqlalchemy)