1
=== modified file 'database/replication/Makefile'
2
--- database/replication/Makefile	2009-11-13 10:41:58 +0000
3
+++ database/replication/Makefile	2009-11-18 04:00:30 +0000
4
@@ -36,6 +36,8 @@
5
36
STAGING_CONFIG=staging # For swapping fresh db into place.
36
STAGING_CONFIG=staging # For swapping fresh db into place.
6
37
STAGING_DUMP=launchpad.dump # Dumpfile to build new staging from.
37
STAGING_DUMP=launchpad.dump # Dumpfile to build new staging from.
7
38
STAGING_TABLESPACE=pg_default # 'pg_default' for default
38
STAGING_TABLESPACE=pg_default # 'pg_default' for default
8
39
DOGFOOD_DBNAME=launchpad_dogfood
9
40
DOGFOOD_DUMP=launchpad.dump
10
39
41
11
40
_CONFIG=overridden-on-command-line
42
_CONFIG=overridden-on-command-line
12
41
_SLAVE_TABLESPACE=pg_default
43
_SLAVE_TABLESPACE=pg_default
13
@@ -98,12 +100,13 @@
14
98
	psql -q -d lpmain_staging_new -f authdb_drop.sql
100
	psql -q -d lpmain_staging_new -f authdb_drop.sql
15
99
	psql -q -d lpmain_staging_new -f authdb_create.sql \
101
	psql -q -d lpmain_staging_new -f authdb_create.sql \
16
100
	    2>&1 | grep -v _sl || true
102
	    2>&1 | grep -v _sl || true
17
103
	# Restore the data
18
104
	pg_restore --dbname=lpmain_staging_new \
19
105
	    --no-acl --no-owner --disable-triggers --data-only \
20
106
	    --exit-on-error ${STAGING_DUMP}
21
101
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
107
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
22
102
	# Slony-I installed isn't usable without this step.
108
	# Slony-I installed isn't usable without this step.
23
103
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
109
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
24
104
	pg_restore --dbname=lpmain_staging_new \
25
105
	    --no-acl --no-owner --disable-triggers --data-only \
26
106
	    --exit-on-error ${STAGING_DUMP}
27
107
	# Setup replication
110
	# Setup replication
28
108
	make _replicate LPCONFIG=${NEW_STAGING_CONFIG} LAG="0 seconds" \
111
	make _replicate LPCONFIG=${NEW_STAGING_CONFIG} LAG="0 seconds" \
29
109
	    _MASTER=lpmain_staging_new _SLAVE=lpmain_staging_slave_new \
112
	    _MASTER=lpmain_staging_new _SLAVE=lpmain_staging_slave_new \
30
@@ -138,10 +141,10 @@
31
138
	psql -q -d ${DOGFOOD_DBNAME} -f authdb_drop.sql
141
	psql -q -d ${DOGFOOD_DBNAME} -f authdb_drop.sql
32
139
	psql -q -d ${DOGFOOD_DBNAME} -f authdb_create.sql \
142
	psql -q -d ${DOGFOOD_DBNAME} -f authdb_create.sql \
33
140
	    2>&1 | grep -v _sl || true
143
	    2>&1 | grep -v _sl || true
34
141
	./repair-restored-db.py -d ${DOGFOOD_DBNAME}
35
142
	pg_restore --dbname=${DOGFOOD_DBNAME} --no-acl --no-owner \
144
	pg_restore --dbname=${DOGFOOD_DBNAME} --no-acl --no-owner \
36
143
	    --disable-triggers --data-only \
145
	    --disable-triggers --data-only \
37
144
	    --exit-on-error ${DOGFOOD_DUMP}
146
	    --exit-on-error ${DOGFOOD_DUMP}
38
147
	./repair-restored-db.py -d ${DOGFOOD_DBNAME}
39
145
	../schema/upgrade.py -d ${DOGFOOD_DBNAME}
148
	../schema/upgrade.py -d ${DOGFOOD_DBNAME}
40
146
	../schema/fti.py -d ${DOGFOOD_DBNAME}
149
	../schema/fti.py -d ${DOGFOOD_DBNAME}
41
147
	../schema/security.py -d ${DOGFOOD_DBNAME}
150
	../schema/security.py -d ${DOGFOOD_DBNAME}
42
148
151
43
=== modified file 'database/replication/repair-restored-db.py'
44
--- database/replication/repair-restored-db.py	2009-10-17 14:06:03 +0000
45
+++ database/replication/repair-restored-db.py	2009-11-18 04:00:30 +0000
46
@@ -27,7 +27,8 @@
47
27
27
48
28
from canonical.config import config
28
from canonical.config import config
49
29
from canonical.database.postgresql import ConnectionString
29
from canonical.database.postgresql import ConnectionString
51
30
from canonical.database.sqlbase import connect, quote
30
from canonical.database.sqlbase import (
52
31
    connect, quote, ISOLATION_LEVEL_AUTOCOMMIT)
53
31
from canonical.launchpad.scripts import db_options, logger_options, logger
32
from canonical.launchpad.scripts import db_options, logger_options, logger
54
32
33
55
33
import replication.helpers
34
import replication.helpers
56
@@ -44,12 +45,23 @@
57
44
45
58
45
    log = logger(options)
46
    log = logger(options)
59
46
47
61
47
    con = connect(options.dbuser)
48
    con = connect(options.dbuser, isolation=ISOLATION_LEVEL_AUTOCOMMIT)
62
48
49
63
49
    if not replication.helpers.slony_installed(con):
50
    if not replication.helpers.slony_installed(con):
64
50
        log.info("Slony-I not installed. Nothing to do.")
51
        log.info("Slony-I not installed. Nothing to do.")
65
51
        return 0
52
        return 0
66
52
53
67
54
    if not repair_with_slonik(log, options, con):
68
55
        repair_with_drop_schema(log, con)
69
56
70
57
    return 0
71
58
72
59
73
60
def repair_with_slonik(log, options, con):
74
61
    """Attempt to uninstall Slony-I via 'UNINSTALL NODE' per best practice.
75
62
76
63
    Returns True on success, False if unable to do so for any reason.
77
64
    """
78
53
    cur = con.cursor()
65
    cur = con.cursor()
79
54
66
80
55
    # Determine the node id the database thinks it is.
67
    # Determine the node id the database thinks it is.
81
@@ -60,27 +72,19 @@
82
60
        cur.execute(cmd)
72
        cur.execute(cmd)
83
61
        node_id = cur.fetchone()[0]
73
        node_id = cur.fetchone()[0]
84
62
        log.debug("Node Id is %d" % node_id)
74
        log.debug("Node Id is %d" % node_id)
85
75
86
76
        # Get a list of set ids in the database.
87
77
        cur.execute(
88
78
            "SELECT DISTINCT set_id FROM %s.sl_set"
89
79
            % replication.helpers.CLUSTER_NAMESPACE)
90
80
        set_ids = set(row[0] for row in cur.fetchall())
91
81
        log.debug("Set Ids are %s" % repr(set_ids))
92
82
93
63
    except psycopg2.InternalError:
83
    except psycopg2.InternalError:
94
64
        # Not enough information to determine node id. Possibly
84
        # Not enough information to determine node id. Possibly
114
65
        # this is an empty database. Just drop the _sl schema as
85
        # this is an empty database.
115
66
        # it is 'good enough' with Slony-I 1.2 - this mechanism
86
        log.debug('Broken or no Slony-I install.')
116
67
        # fails with Slony added primary keys, but we don't do that.
87
        return False
98
68
        con.rollback()
99
69
        cur = con.cursor()
100
70
        cur.execute("DROP SCHEMA _sl CASCADE")
101
71
        con.commit()
102
72
        return 0
103
73
104
74
    # Get a list of set ids in the database.
105
75
    cur.execute(
106
76
        "SELECT DISTINCT set_id FROM %s.sl_set"
107
77
        % replication.helpers.CLUSTER_NAMESPACE)
108
78
    set_ids = set(row[0] for row in cur.fetchall())
109
79
    log.debug("Set Ids are %s" % repr(set_ids))
110
80
111
81
    # Close so we don't block slonik(1)
112
82
    del cur
113
83
    con.close()
117
84
88
118
85
    connection_string = ConnectionString(config.database.main_master)
89
    connection_string = ConnectionString(config.database.main_master)
119
86
    if options.dbname:
90
    if options.dbname:
120
@@ -103,7 +107,22 @@
121
103
        log.debug(line)
107
        log.debug(line)
122
104
    script = '\n'.join(script)
108
    script = '\n'.join(script)
123
105
109
125
106
    replication.helpers.execute_slonik(script, auto_preamble=False)
110
    return replication.helpers.execute_slonik(
126
111
        script, auto_preamble=False, exit_on_fail=False)
127
112
128
113
129
114
def repair_with_drop_schema(log, con):
130
115
    """
131
116
    Just drop the _sl schema as it is 'good enough' with Slony-I 1.2.
132
117
133
118
    This mechanism fails with Slony added primary keys, but we don't
134
119
    do that.
135
120
    """
136
121
    log.info('Fallback mode - dropping _sl schema.')
137
122
    cur = con.cursor()
138
123
    cur.execute("DROP SCHEMA _sl CASCADE")
139
124
    return True
140
125
141
107
126
142
108
if __name__ == '__main__':
127
if __name__ == '__main__':
143
109
    sys.exit(main())
128
    sys.exit(main())
Reviewer	Review Type	Date Requested	Status
Tim Penhey (community)		2009-11-18	Approve on 2009-11-18
Review via email: mp+14980@code.launchpad.net