diff options
| author | martinko | 2013-09-20 12:40:41 +0000 |
|---|---|---|
| committer | martinko | 2013-09-20 12:40:41 +0000 |
| commit | 6b9325e67b2d607eb24b2d2fe52cba8b4b92e66f (patch) | |
| tree | 3632b86e9ebbc8060a3d9fe6b40e3eb9141c395f | |
| parent | 49ac8090682a5d76b577eeade3e29c9e4d83650c (diff) | |
| parent | a7d76ba02aecd5b3bbc0e2b009b1a6e182b97d62 (diff) | |
Merge branch 'hotfix/3.1.5.3'3.1.5.3
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/skytools3.install | 1 | ||||
| -rw-r--r-- | python/londiste/handlers/dispatch.py | 2 | ||||
| -rw-r--r-- | sql/pgq/functions/pgq.grant_perms.sql | 3 | ||||
| -rw-r--r-- | sql/pgq/structure/grants.ini | 2 |
5 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b073d363..f15aec6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +skytools3 (3.1.5.3) experimental; urgency=low + + * v3.1.5.3 + + -- martinko <gamato@users.sf.net> Fri, 20 Sep 2013 14:28:56 +0200 + +skytools3 (3.1.5.2) experimental; urgency=low + + * v3.1.5.2 + + -- Marko Kreen <markokr@gmail.com> Wed, 18 Sep 2013 15:41:00 +0300 + skytools3 (3.1.5) experimental; urgency=low * v3.1.5 diff --git a/debian/skytools3.install b/debian/skytools3.install index 7c6145d5..6af009a8 100644 --- a/debian/skytools3.install +++ b/debian/skytools3.install @@ -5,6 +5,7 @@ usr/bin/queue_mover3 usr/bin/queue_splitter3 usr/bin/simple_consumer3 usr/bin/simple_local_consumer3 +usr/bin/data_maintainer3 debian/skytools.ini /etc usr/lib/python*/site-packages/skytools-3.0/londiste usr/share/skytools3 diff --git a/python/londiste/handlers/dispatch.py b/python/londiste/handlers/dispatch.py index 0b02edcd..7590ee73 100644 --- a/python/londiste/handlers/dispatch.py +++ b/python/londiste/handlers/dispatch.py @@ -913,6 +913,8 @@ class Dispatcher (ShardHandler): self.drop_obsolete_partitions (self.dest_table, self.conf.retention_period, self.conf.period) if self.conf.ignore_old_events and not skytools.exists_table(curs, dst): self.ignored_tables.add(dst) # must have been just dropped + if dst in self.row_handler.table_map: + del self.row_handler.table_map[dst] def drop_obsolete_partitions (self, parent_table, retention_period, partition_period): """ Drop obsolete partitions of partition-by-date parent table. diff --git a/sql/pgq/functions/pgq.grant_perms.sql b/sql/pgq/functions/pgq.grant_perms.sql index 97412367..a64e9fc6 100644 --- a/sql/pgq/functions/pgq.grant_perms.sql +++ b/sql/pgq/functions/pgq.grant_perms.sql @@ -42,7 +42,8 @@ begin -- event seq execute 'grant select on ' || pgq.quote_fqname(q.queue_event_seq) || ' to public'; - + execute 'grant usage on ' || pgq.quote_fqname(q.queue_event_seq) || ' to pgq_admin'; + -- set grants on parent table perform pgq._grant_perms_from('pgq', 'event_template', dst_schema, dst_table); diff --git a/sql/pgq/structure/grants.ini b/sql/pgq/structure/grants.ini index b83d27c5..96b59c3f 100644 --- a/sql/pgq/structure/grants.ini +++ b/sql/pgq/structure/grants.ini @@ -31,7 +31,7 @@ public = select [5.event.tables] on.tables = pgq.event_template pgq_reader = select -pgq_admin = select, truncate +pgq_admin = select, insert, truncate # drop public access to events public = |