1
=== modified file 'database/replication/Makefile'
2
--- database/replication/Makefile	2010-01-06 15:53:35 +0000
3
+++ database/replication/Makefile	2010-01-13 08:43:16 +0000
4
@@ -110,6 +110,7 @@
5
110
		--no-acl --no-owner --disable-triggers --data-only \
110
		--no-acl --no-owner --disable-triggers --data-only \
6
111
		--table=$$table ${STAGING_DUMP}; \
111
		--table=$$table ${STAGING_DUMP}; \
7
112
	done
112
	done
8
113
	psql -q -d lpmain_staging_new -f authdb_sequences.sql
9
113
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
114
	# Uninstall Slony-I if it is installed - a pg_dump of a DB with
10
114
	# Slony-I installed isn't usable without this step.
115
	# Slony-I installed isn't usable without this step.
11
115
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
116
	LPCONFIG=${NEW_STAGING_CONFIG} ./repair-restored-db.py
12
116
117
13
=== added file 'database/replication/authdb_sequences.sql'
14
--- database/replication/authdb_sequences.sql	1970-01-01 00:00:00 +0000
15
+++ database/replication/authdb_sequences.sql	2010-01-13 08:43:16 +0000
16
@@ -0,0 +1,22 @@
17
1
-- Repair sequences in the authdb replication set. We need to do this because
18
2
-- we cannot restore the sequence values from the dump when restoring the
19
3
-- data using pg_restore --data-only.
20
4
21
5
SELECT setval('account_id_seq', max(id)) AS Account
22
6
FROM Account;
23
7
24
8
SELECT setval('accountpassword_id_seq', max(id)) AS AccountPassword
25
9
FROM AccountPassword;
26
10
27
11
SELECT setval('authtoken_id_seq', max(id)) AS AuthToken
28
12
FROM AuthToken;
29
13
30
14
SELECT setval('emailaddress_id_seq', max(id)) AS EmailAddress
31
15
FROM EmailAddress;
32
16
33
17
SELECT setval('openidauthorization_id_seq', max(id)) AS OpenIDAuthorization
34
18
FROM OpenIDAuthorization;
35
19
36
20
SELECT setval('openidrpsummary_id_seq', max(id)) AS OpenIDRPSummary
37
21
FROM OpenIDRPSummary;
38
22
39
0
23
40
=== modified file 'database/replication/new-slave.py'
41
--- database/replication/new-slave.py	2009-12-03 09:47:24 +0000
42
+++ database/replication/new-slave.py	2010-01-13 08:43:16 +0000
43
@@ -162,13 +162,22 @@
44
162
    target_con.commit()
162
    target_con.commit()
45
163
    del target_con
163
    del target_con
46
164
164
48
165
    # Get a list of existing set ids.
165
    # Get a list of existing set ids that can be subscribed too. This
49
166
    # is all sets where the origin is the master_node, and set 2 if
50
167
    # the master happens to be configured as a forwarding slave. We
51
168
    # don't allow other sets where the master is configured as a
52
169
    # forwarding slave as we have to special case rebuilding the database
53
170
    # schema (such as we do for the authdb replication set 2).
54
166
    source_connection.rollback()
171
    source_connection.rollback()
55
167
    master_node = replication.helpers.get_master_node(source_connection)
172
    master_node = replication.helpers.get_master_node(source_connection)
56
168
    cur = source_connection.cursor()
173
    cur = source_connection.cursor()
60
169
    cur.execute(
174
    cur.execute("""
61
170
        "SELECT set_id FROM _sl.sl_set WHERE set_origin=%d"
175
        SELECT set_id FROM _sl.sl_set WHERE set_origin=%d
62
171
        % master_node.node_id)
176
        UNION
63
177
        SELECT sub_set AS set_id FROM _sl.sl_subscribe
64
178
        WHERE sub_receiver=%d AND sub_forward IS TRUE AND sub_active IS TRUE
65
179
            AND sub_set=2
66
180
        """ % (master_node.node_id, master_node.node_id))
67
172
    set_ids = [set_id for set_id, in cur.fetchall()]
181
    set_ids = [set_id for set_id, in cur.fetchall()]
68
173
    log.debug("Discovered set ids %s" % repr(list(set_ids)))
182
    log.debug("Discovered set ids %s" % repr(list(set_ids)))
69
174
183
Reviewer	Review Type	Date Requested	Status
Henning Eggers (community)	code	2010-01-13	Approve on 2010-01-13
Review via email: mp+17278@code.launchpad.net