Merge lp:~stub/charms/precise/postgresql/test-upgrade-charm into lp:charms/postgresql

[Stuart Bishop]

I've been trying to track down a weird state I've seen. This test failed to find it, since it passes, but it is a useful test to keep. It simply confirms that 'juju upgrade-charm' keeps the existing database intact. It doesn't test upgrades from old versions of the charm, which will be mojo jobs.

[lp:~stub/charms/precise/postgresql/test-upgrade-charm]

156. By Stuart Bishop on 2014-08-22

Merged wal-e into test-upgrade-charm.

157. By Stuart Bishop on 2014-08-27

Merged wal-e into test-upgrade-charm.

158. By Stuart Bishop on 2014-08-27

Merged wal-e into test-upgrade-charm.

159. By Stuart Bishop on 2014-08-27

Merged wal-e into test-upgrade-charm.

160. By Stuart Bishop on 2014-08-27

Merged wal-e into test-upgrade-charm.

[Whit Morriss (whitmo)]

merged in https://code.launchpad.net/~stub/charms/precise/postgresql/integration/+merge/233666

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1037-results

review: Needs Fixing (automated testing)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-08-27 12:56:34 +0000
+++ hooks/hooks.py	2014-08-27 12:56:34 +0000
@@ -145,6 +145,7 @@
         for relid in hookenv.relation_ids('replication'):
             hookenv.relation_set(relid, replication_state)
 
+        log('saving local state', DEBUG)
         self.save()
 
 
@@ -1125,11 +1126,13 @@
     config_data = hookenv.config()
     update_repos_and_packages()
     if not 'state' in local_state:
+        log('state not in {}'.format(local_state.keys()), DEBUG)
         # Fresh installation. Because this function is invoked by both
         # the install hook and the upgrade-charm hook, we need to guard
         # any non-idempotent setup. We should probably fix this; it
         # seems rather fragile.
         local_state.setdefault('state', 'standalone')
+        log(repr(local_state.keys()), DEBUG)
 
         # Drop the cluster created when the postgresql package was
         # installed, and rebuild it with the requested locale and encoding.
@@ -1149,6 +1152,7 @@
             'allocated port {!r} != {!r}'.format(
                 get_service_port(), config_data['listen_port']))
         local_state['port'] = get_service_port()
+        log('publishing state', DEBUG)
         local_state.publish()
 
     postgresql_backups_dir = (

=== modified file 'test.py'
--- test.py	2014-08-27 12:56:34 +0000
+++ test.py	2014-08-27 12:56:34 +0000
@@ -302,8 +302,9 @@
             if postgres_unit in full_rel_info[rel_name][rel_id]:
                 rel_info = full_rel_info[rel_name][rel_id][postgres_unit]
                 break
-        assert rel_info is not None, 'Unable to find pg rel info {!r}'.format(
-            full_rel_info[rel_name])
+        assert rel_info is not None, (
+            'Unable to find pg rel info {} {!r}'.format(
+                postgres_unit, full_rel_info[rel_name]))
 
         if dbname is None:
             dbname = rel_info['database']
@@ -864,6 +865,27 @@
             'rsyslog' not in status['services'], 'rsyslog failed to die')
         self.wait_until_ready(pg_units)
 
+    def test_upgrade_charm(self):
+        self.juju.deploy(
+            TEST_CHARM, 'postgresql', num_units=2, config=self.pg_config)
+        self.juju.deploy(PSQL_CHARM, 'psql')
+        self.juju.do(['add-relation', 'postgresql:db', 'psql:db'])
+        pg_units = ['postgresql/0', 'postgresql/1']
+        self.wait_until_ready(pg_units)
+
+        # Create something
+        self.sql("CREATE TABLE Foo AS SELECT TRUE", 'master')
+
+        # Kick off the upgrade-charm hook
+        self.juju.do(['upgrade-charm', 'postgresql'])
+        self.wait_until_ready(pg_units)
+
+        # Ensure that our data has perservered.
+        master_data = self.sql('SELECT * FROM Foo', 'master')[0][0]
+        self.assertTrue(master_data)
+        standby_data = self.sql('SELECT * FROM Foo', 'hot standby')[0][0]
+        self.assertTrue(standby_data)
+
 
 class PG91Tests(
         PostgreSQLCharmBaseTestCase,