From 090cb56ba100d53dc7c95148dde77a8a4969adfe Mon Sep 17 00:00:00 2001
From: Louis Taylor <kragniz@gmail.com>
Date: Wed, 26 Nov 2014 19:55:23 +0000
Subject: [PATCH] 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
---
 etc/glance-api.conf                     |  4 ++--
 etc/glance-registry.conf                |  4 ++--
 glance/common/wsgi.py                   |  4 ++--
 glance/tests/unit/common/test_config.py | 12 ++++++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/etc/glance-api.conf b/etc/glance-api.conf
index e2cd102bb0..b3b43d2f89 100644
--- a/etc/glance-api.conf
+++ b/etc/glance-api.conf
@@ -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 ============================
diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf
index 87d61c4573..a72abf8ca3 100644
--- a/etc/glance-registry.conf
+++ b/etc/glance-registry.conf
@@ -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
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index 4e6b56ab65..57b9f5e1d9 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -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."))
 ]
 
diff --git a/glance/tests/unit/common/test_config.py b/glance/tests/unit/common/test_config.py
index b7baee21f0..fd67bcd13d 100644
--- a/glance/tests/unit/common/test_config.py
+++ b/glance/tests/unit/common/test_config.py
@@ -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)