Merge lp:~stub/charms/precise/postgresql/bug-1084263-fix-broken-hooks into lp:charms/postgresql

[Stuart Bishop]

Fix the relation broken hooks, which juju now requires to actually work.

[lp:~stub/charms/precise/postgresql/bug-1084263-fix-broken-hooks]

56. By Stuart Bishop on 2013-06-19

Merged cleanups into bug-1084263-fix-broken-hooks.

57. By Stuart Bishop on 2013-06-19

Fix and reorder imports, charmhelpers moved

58. By Stuart Bishop on 2013-06-19

Merged cleanups into bug-1084263-fix-broken-hooks.

59. By Stuart Bishop on 2013-06-19

Merged cleanups into bug-1084263-fix-broken-hooks.

60. By Stuart Bishop on 2013-06-19

Merged cleanups into bug-1084263-fix-broken-hooks.

61. By Stuart Bishop on 2013-06-20

Merged cleanups into bug-1084263-fix-broken-hooks.

62. By Stuart Bishop on 2013-06-20

Merged cleanups into bug-1084263-fix-broken-hooks.

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-05-29 11:42:28 +0000
+++ hooks/hooks.py	2013-06-20 14:25:32 +0000
@@ -1,24 +1,26 @@
 #!/usr/bin/env python
 # vim: et ai ts=4 sw=4:
 
+import commands
 import cPickle as pickle
+import glob
+from grp import getgrnam
 import json
-import yaml
-import os
-import glob
+import os.path
+from pwd import getpwnam
 import random
 import re
 import shutil
+import socket
 import string
-import socket
 import subprocess
 import sys
 from textwrap import dedent
 import time
+import yaml
 from yaml.constructor import ConstructorError
-import commands
-from pwd import getpwnam
-from grp import getgrnam
+
+from charmhelpers.core import hookenv
 
 
 # jinja2 may not be importable until the install hook has installed the
@@ -1088,6 +1090,8 @@
                     postgresql_restart()
                     break
 
+    snapshot_relations()
+
 
 def quote_identifier(identifier):
     r'''Quote an identifier, such as a table or role name.
@@ -1244,6 +1248,16 @@
     return this_host.strip()
 
 
+def snapshot_relations():
+    '''Snapshot our relation information into local state.
+
+    We need this information to be available in -broken
+    hooks letting us actually clean up properly. Bug #1190996.
+    '''
+    local_state['relations'] = hookenv.relations()
+    local_state.save()
+
+
 def db_relation_joined_changed(user, database, roles):
     if not user_exists(user):
         password = create_user(user)
@@ -1263,6 +1277,8 @@
                             schema_user=schema_user,
                             database=database)
 
+    snapshot_relations()
+
 
 def db_admin_relation_joined_changed(user, database='all'):
     if not user_exists(user):
@@ -1274,22 +1290,37 @@
         host, config_data["listen_port"]))
     generate_postgresql_hba(postgresql_hba)
 
-
-def db_relation_broken(user, database):
+    snapshot_relations()
+
+
+def db_relation_broken():
     from psycopg2.extensions import AsIs
 
-    sql = "REVOKE ALL PRIVILEGES ON %s FROM %s"
+    # The relation no longer exists, so we can't pull the database name
+    # we used from there. Instead, we have to persist this information
+    # ourselves.
+    relation = local_state['relations']['db'][os.environ['JUJU_RELATION_ID']]
+    unit_relation_data = relation[os.environ['JUJU_UNIT_NAME']]
+
+    user = unit_relation_data['user']
+    database = unit_relation_data['database']
+
+    sql = "REVOKE ALL PRIVILEGES ON DATABASE %s FROM %s"
     run_sql_as_postgres(sql, AsIs(quote_identifier(database)),
                         AsIs(quote_identifier(user)))
     run_sql_as_postgres(sql, AsIs(quote_identifier(database)),
                         AsIs(quote_identifier(user + "_schema")))
 
+    # Cleanup our local state.
+    snapshot_relations()
+
 
 def db_admin_relation_broken(user):
     from psycopg2.extensions import AsIs
 
-    sql = "ALTER USER %s NOSUPERUSER"
-    run_sql_as_postgres(sql, AsIs(quote_identifier(user)))
+    if user_exists(user):
+        sql = "ALTER USER %s NOSUPERUSER"
+        run_sql_as_postgres(sql, AsIs(quote_identifier(user)))
     generate_postgresql_hba(postgresql_hba)
 
 
@@ -1671,7 +1702,6 @@
 
 def replication_relation_broken():
     config_changed(postgresql_config)
-    authorize_remote_ssh()
 
 
 def clone(master_unit, master_host):
@@ -1898,7 +1928,7 @@
         db_relation_joined_changed(user, database, [])  # No roles yet.
 
     elif hook_name == "db-relation-changed":
-        roles = filter(None, relation_get('roles').split(","))
+        roles = filter(None, (relation_get('roles') or '').split(","))
 
         # If the remote service has requested we use a particular database
         # name, honour that request.
@@ -1913,10 +1943,7 @@
         db_relation_joined_changed(user, database, roles)
 
     elif hook_name == "db-relation-broken":
-        database = relation_get('database')
-        user = user_name(
-            os.environ['JUJU_RELATION_ID'], os.environ['JUJU_REMOTE_UNIT'])
-        db_relation_broken(user, database)
+        db_relation_broken()
 
     elif hook_name in ("db-admin-relation-joined",
                        "db-admin-relation-changed"):