Merge lp:~stub/charms/trusty/postgresql/fix-max-connections into lp:charms/trusty/postgresql

[Stuart Bishop]

Some deprecated options where not overriding the defaults in extra_pg_conf. Fix this by collating the settings in the correct order (overrides second).

[Stuart Bishop (stub)]

The config.yaml change is removing a duplicate entry in the extra_pg_conf default.

[Andrew McLeod (admcleod)]

bundletested this, all tests passed, looks good. The automated tests seem to be stuck... +1

review: Approve

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2254/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2446/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2447/

review: Needs Fixing (automated testing)

=== modified file 'config.yaml'
--- config.yaml	2015-12-30 09:05:19 +0000
+++ config.yaml	2016-01-18 16:42:07 +0000
@@ -59,7 +59,6 @@
       default: |
         # Additional service specific postgresql.conf settings.
         listen_addresses='*'
-        max_connections=100
         ssl=true
         log_timezone=UTC
         log_checkpoints=true
 
=== modified file 'hooks/service.py'
--- hooks/service.py	2016-01-14 11:39:52 +0000
+++ hooks/service.py	2016-01-18 16:42:07 +0000
@@ -462,12 +462,14 @@
     # Start with charm defaults.
     conf.update(postgresql_conf_defaults())
 
-    # User overrides from deprecated service config.
-    conf.update(postgresql_conf_deprecated_overrides())
-
     # User overrides from service config.
     conf.update(postgresql_conf_overrides())
 
+    # User overrides from deprecated service config. Settings are
+    # only returned if the user changed them from the default. If so,
+    # they override the settings listed in extra_pg_conf.
+    conf.update(postgresql_conf_deprecated_overrides())
+
     # Ensure minimal settings so the charm can actually work.
     ensure_viable_postgresql_conf(conf)
 
 
=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2015-12-19 08:25:47 +0000
+++ tests/test_integration.py	2016-01-18 16:42:07 +0000
@@ -529,7 +529,15 @@
 
 class PG93Tests(PGBaseTestCase, unittest.TestCase):
     test_config = dict(version=(None if SERIES == 'trusty' else '9.3'),
-                       pgdg=(False if SERIES == 'trusty' else True))
+                       pgdg=(False if SERIES == 'trusty' else True),
+                       max_connections=150)
+
+    def test_deprecated_overrides(self):
+        con = self.connect()
+        cur = con.cursor()
+        cur.execute('show max_connections')
+        max_connections = cur.fetchone()[0]
+        self.assertEqual(int(max_connections), 150)
 
 
 class PG93MultiTests(PGMultiBaseTestCase, unittest.TestCase):